summaryrefslogtreecommitdiff
path: root/openerp/cli/server.py
diff options
context:
space:
mode:
authorniv-openerp <nicolas.vanhoren@openerp.com>2013-01-29 16:05:25 +0100
committerniv-openerp <nicolas.vanhoren@openerp.com>2013-01-29 16:05:25 +0100
commit7010e8543ec74a173abb44d43e1dfb2672f94840 (patch)
treeb0a4503a1162232e4d2323a045da02b2ad61d1a6 /openerp/cli/server.py
parent613775dd4197cc00121cbd7b33f9a66c91e9a3a2 (diff)
parented0a292f5d2f766dd0be3cbf258d1f05a13fbbbf (diff)
Merge Thu branch
bzr revid: nicolas.vanhoren@openerp.com-20130129150525-bcbh9b5jp8l2yath
Diffstat (limited to 'openerp/cli/server.py')
-rw-r--r--openerp/cli/server.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/openerp/cli/server.py b/openerp/cli/server.py
index dee78cda4e9..dbb77d72ca6 100644
--- a/openerp/cli/server.py
+++ b/openerp/cli/server.py
@@ -231,6 +231,7 @@ def main(args):
openerp.tools.config.parse_config(args)
if openerp.tools.config.options["gevent"]:
+ openerp.evented = True
_logger.info('Using gevent mode')
import gevent.monkey
gevent.monkey.patch_all()
@@ -240,9 +241,6 @@ def main(args):
check_postgres_user()
openerp.netsvc.init_logger()
report_configuration()
-
- if openerp.tools.config.options["gevent"]:
- _logger.info('Using gevent mode')
config = openerp.tools.config