First version, does not close correctly

bzr revid: nicolas.vanhoren@openerp.com-20130606123733-j6d2lpcgrvxfa7yr

1 files changed, 6 insertions, 2 deletions

diff --git a/openerp/cli/server.py b/openerp/cli/server.py
index 2ee9e53b3ca..3d269a3c458 100644
--- a/openerp/cli/server.py
+++ b/openerp/cli/server.py
@@ -257,9 +257,13 @@ def main(args):
         setup_pid_file()
         # Some module register themselves when they are loaded so we need the
         # services to be running before loading any registry.
-        if config['workers']:
-            openerp.service.start_services_workers()
+        if not openerp.evented:
+            if config['workers']:
+                openerp.service.start_services_workers()
+            else:
+                openerp.service.start_services()
         else:
+            config['xmlrpc_port'] = config['longpolling_port']
             openerp.service.start_services()
 
     rc = 0