From 78ea8eb0586ff108bde4da3c144ff48b73dbedf8 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Thu, 26 Nov 2015 10:40:59 +0100 Subject: [PATCH] [FIX] core: correcly handle pidfile deletion. As atexit function are inherited by subprocess, the pidfile was always deleted when the first worker (http or cron) died. Now, only the process that created the pidfile will delete it. --- openerp/cli/server.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/openerp/cli/server.py b/openerp/cli/server.py index f3932b4bf60..d532a067b5b 100644 --- a/openerp/cli/server.py +++ b/openerp/cli/server.py @@ -80,9 +80,9 @@ def report_configuration(): ('database user', config['db_user'])]: _logger.info("%s: %s", name, value) -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: @@ -95,10 +95,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():