[MERGE] from trunk

[odoo/odoo.git] / openerp-server

diff --git a/openerp-server b/openerp-server
index 5222de8..12b6962 100755 (executable)
--- a/openerp-server
+++ b/openerp-server
@@ -30,6 +30,7 @@ GNU Public Licence.
 (c) 2003-TODAY, Fabien Pinckaers - OpenERP SA
 """
 
+import imp
 import logging
 import os
 import signal
@@ -104,12 +105,13 @@ def run_test_file(dbname, test_file):
         db, registry = openerp.pooler.get_db_and_pool(dbname, update_module=config['init'] or config['update'], pooljobs=False)
         cr = db.cursor()
         _logger.info('loading test file %s', test_file)
-        openerp.tools.convert_yaml_import(cr, 'base', file(test_file), 'test', {}, 'test', True)
+        openerp.tools.convert_yaml_import(cr, 'base', file(test_file), {}, 'test', True)
         cr.rollback()
         cr.close()
     except Exception:
         _logger.exception('Failed to initialize database `%s` and run test file `%s`.', dbname, test_file)
 
+
 def export_translation():
     config = openerp.tools.config
     dbname = config['db_name']
@@ -201,10 +203,9 @@ def quit_on_signals():
     try:
         while quit_signals_received == 0:
             time.sleep(60)
-    except KeyboardInterrupt:
+    except KeyboardInterrupt, e:
         pass
 
-    config = openerp.tools.config
     if config['pidfile']:
         os.unlink(config['pidfile'])
 
@@ -217,7 +218,8 @@ def configure_babel_localedata_path():
         import babel
         babel.localedata._dirname = os.path.join(os.path.dirname(sys.executable), 'localedata')
 
-def main():
+if __name__ == "__main__":
+
     os.environ["TZ"] = "UTC"
 
     check_root_user()
@@ -246,13 +248,20 @@ def main():
         sys.exit(0)
 
     if not config["stop_after_init"]:
-        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()
-        else:
-            openerp.service.start_services()
+        openerp.service.start_services()
+
+    for m in openerp.conf.server_wide_modules:
+        try:
+            openerp.modules.module.load_openerp_module(m)
+        except Exception:
+            msg = ''
+            if m == 'web':
+                msg = """
+The `web` module is provided by the addons found in the `openerp-web` project.
+Maybe you forgot to add those addons in your addons_path configuration."""
+            _logger.exception('Failed to load server-wide module `%s`.%s', m, msg)
 
     if config['db_name']:
         for dbname in config['db_name'].split(','):
@@ -261,10 +270,8 @@ def main():
     if config["stop_after_init"]:
         sys.exit(0)
 
+    setup_pid_file()
     _logger.info('OpenERP server is running, waiting for connections...')
     quit_on_signals()
 
-if __name__ == "__main__":
-    main()
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: