[MERGE] forward port of branch saas-3 up to revid 5112 chs@openerp.com-20140407144238-3s38zadkh7yxpdy7

bzr revid: chs@openerp.com-20140407160548-ttuc877kknuycoqw

1 files changed, 9 insertions, 3 deletions

diff --git a/openerp/cli/server.py b/openerp/cli/server.py
index e7ba695f19c..561b9a19879 100644
--- a/openerp/cli/server.py
+++ b/openerp/cli/server.py
@@ -29,6 +29,7 @@ GNU Public Licence.
 (c) 2003-TODAY, Fabien Pinckaers - OpenERP SA
 """
 
+import atexit
 import logging
 import os
 import signal
@@ -78,16 +79,23 @@ def report_configuration():
                         ('database user', config['db_user'])]:
         _logger.info("%s: %s", name, value)
 
+def rm_pid_file():
+    config = openerp.tools.config
+    if not openerp.evented and os.path.exists(config['pidfile']):
+        os.unlink(config['pidfile'])
+
 def setup_pid_file():
     """ Create a file with the process id written in it.
 
     This function assumes the configuration has been initialized.
     """
     config = openerp.tools.config
-    if config['pidfile']:
+    if not openerp.evented and config['pidfile']:
         with open(config['pidfile'], 'w') as fd:
             pidtext = "%d" % (os.getpid())
             fd.write(pidtext)
+        atexit.register(rm_pid_file)
+
 
 def export_translation():
     config = openerp.tools.config
@@ -155,8 +163,6 @@ def main(args):
 
     setup_pid_file()
     rc = openerp.service.server.start(preload=preload, stop=stop)
-    if config['pidfile']:
-        os.unlink(config['pidfile'])
     sys.exit(rc)
 
 class Server(Command):