[MERGE] forward port of branch 8.0 up to adf6d0e

1 files changed, 5 insertions, 5 deletions

diff --git a/openerp/cli/server.py b/openerp/cli/server.py
index ef9503da3fe..0cd815ae510 100644
--- a/openerp/cli/server.py
+++ b/openerp/cli/server.py
@@ -79,9 +79,9 @@ def report_configuration():
     else:
         _logger.info('database: %s@unix-socket', config['db_user'])
 
-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:
@@ -94,10 +94,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