diff options
| author | Thibault Delavallée <tde@openerp.com> | 2012-12-21 11:03:20 +0100 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2012-12-21 11:03:20 +0100 |
| commit | 5b3fc4061ba0c84f7e0ff466c4d7025f9cfa44e9 (patch) | |
| tree | d07f2c5bb9ec0ce018b824f91caa5f6f1da9c090 /openerp/cli | |
| parent | 919c0d1152ba869af49e4d9186698d35dbb89541 (diff) | |
| parent | 73cb6d5321cc71d85456e6f6e61fc34b79b95c16 (diff) | |
[MERGE] Sync with trunk.
bzr revid: tde@openerp.com-20121221100320-ntn6zsdcqlvz52xn
Diffstat (limited to 'openerp/cli')
| -rw-r--r-- | openerp/cli/server.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/openerp/cli/server.py b/openerp/cli/server.py index d97d4c81571..bc83b735624 100644 --- a/openerp/cli/server.py +++ b/openerp/cli/server.py @@ -207,10 +207,15 @@ def quit_on_signals(): pass config = openerp.tools.config + openerp.service.stop_services() + + if getattr(openerp, 'phoenix', False): + # like the phoenix, reborn from ashes... + openerp.service._reexec() + return + if config['pidfile']: os.unlink(config['pidfile']) - - openerp.service.stop_services() sys.exit(0) def configure_babel_localedata_path(): |