summaryrefslogtreecommitdiff
path: root/openerp/cli/server.py
diff options
context:
space:
mode:
Diffstat (limited to 'openerp/cli/server.py')
-rw-r--r--openerp/cli/server.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/openerp/cli/server.py b/openerp/cli/server.py
index 5794855cf02..98e8359d76b 100644
--- a/openerp/cli/server.py
+++ b/openerp/cli/server.py
@@ -61,9 +61,9 @@ def report_configuration():
user = config['db_user'] or os.environ.get('PGUSER', 'default')
_logger.info('database: %s@%s:%s', user, host, port)
-def rm_pid_file():
+def rm_pid_file(main_pid):
config = openerp.tools.config
- if not openerp.evented and config['pidfile']:
+ if config['pidfile'] and main_pid == os.getpid():
try:
os.unlink(config['pidfile'])
except OSError:
@@ -76,10 +76,10 @@ def setup_pid_file():
"""
config = openerp.tools.config
if not openerp.evented and config['pidfile']:
+ pid = os.getpid()
with open(config['pidfile'], 'w') as fd:
- pidtext = "%d" % (os.getpid())
- fd.write(pidtext)
- atexit.register(rm_pid_file)
+ fd.write(str(pid))
+ atexit.register(rm_pid_file, pid)
def export_translation():
config = openerp.tools.config