diff options
| author | Antony Lesuisse <al@openerp.com> | 2013-10-13 04:13:22 +0200 |
|---|---|---|
| committer | Antony Lesuisse <al@openerp.com> | 2013-10-13 04:13:22 +0200 |
| commit | d2eb959710137f6ecb4f91d06d4e22bfda3b6de9 (patch) | |
| tree | 8d44a39de1a8f4dd16191bab425d56e70841381a | |
| parent | fb230b98e7eedda5fd6c941d2892cef166807ada (diff) | |
[FIX] ensure the use the registry signaling for registries loaded with -d
bzr revid: al@openerp.com-20131013021322-5ej7ovpcrf7ilnn5
| -rw-r--r-- | openerp/cli/server.py | 5 | ||||
| -rw-r--r-- | openerp/service/server.py | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/openerp/cli/server.py b/openerp/cli/server.py index 24987c098e4..97737a38c3f 100644 --- a/openerp/cli/server.py +++ b/openerp/cli/server.py @@ -168,6 +168,11 @@ def main(args): import_translation() sys.exit(0) + # This needs to be done now to ensure the use of the multiprocessing + # signaling mecanism for registries loaded with -d + if config['workers']: + openerp.multi_process = True + # preload registryies, needed for -u --stop_after_init rc = 0 if config['db_name']: diff --git a/openerp/service/server.py b/openerp/service/server.py index 80a7155926b..7fa6dae0015 100644 --- a/openerp/service/server.py +++ b/openerp/service/server.py @@ -828,7 +828,6 @@ def start(): global server load_server_wide_modules() if config['workers']: - openerp.multi_process = True server = PreforkServer(openerp.service.wsgi_server.application) elif openerp.evented: server = GeventServer(openerp.service.wsgi_server.application) |