[MERGE] lp:827287 (crm,hr_contract,hr_timesheet_sheet,lunch: clean up test from user_...

[odoo/odoo.git] / openerp-server

diff --git a/openerp-server b/openerp-server
index 52ad491..b5275ec 100755 (executable)
--- a/openerp-server
+++ b/openerp-server
@@ -140,7 +140,6 @@ def import_translation():
     cr = openerp.pooler.get_db(dbname).cursor()
     openerp.tools.trans_load( cr, config["translate_in"], config["language"],
         context=context)
-    openerp.tools.trans_update_res_ids(cr)
     cr.commit()
     cr.close()
 
@@ -179,9 +178,12 @@ def dumpstacks(sig, frame):
 def setup_signal_handlers():
     """ Register the signal handler defined above. """
     SIGNALS = map(lambda x: getattr(signal, "SIG%s" % x), "INT TERM".split())
-    map(lambda sig: signal.signal(sig, signal_handler), SIGNALS)
     if os.name == 'posix':
+        map(lambda sig: signal.signal(sig, signal_handler), SIGNALS)
         signal.signal(signal.SIGQUIT, dumpstacks)
+    elif os.name == 'nt':
+        import win32api
+        win32api.SetConsoleCtrlHandler(lambda sig: signal_handler(sig, None), 1)
 
 def quit_on_signals():
     """ Wait for one or two signals then shutdown the server.
@@ -191,9 +193,12 @@ def quit_on_signals():
 
     """
     # Wait for a first signal to be handled. (time.sleep will be interrupted
-    # by the signal handler.)
-    while quit_signals_received == 0:
-        time.sleep(60)
+    # by the signal handler.) The try/except is for the win32 case.
+    try:
+        while quit_signals_received == 0:
+            time.sleep(60)
+    except KeyboardInterrupt, e:
+        pass
 
     if config['pidfile']:
         os.unlink(config['pidfile'])
@@ -232,13 +237,6 @@ if __name__ == "__main__":
         # services to be running before loading any registry.
         openerp.service.start_services()
 
-    if config['db_name']:
-        for dbname in config['db_name'].split(','):
-            preload_registry(dbname)
-
-    if config["stop_after_init"]:
-        sys.exit(0)
-
     for m in openerp.conf.server_wide_modules:
         try:
             __import__(m)
@@ -247,7 +245,19 @@ if __name__ == "__main__":
             if info['post_load']:
                 getattr(sys.modules[m], info['post_load'])()
         except Exception:
-            logging.exception('Failed to load server-wide module `%s`', m)
+            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."""
+            logging.exception('Failed to load server-wide module `%s`.%s', m, msg)
+
+    if config['db_name']:
+        for dbname in config['db_name'].split(','):
+            preload_registry(dbname)
+
+    if config["stop_after_init"]:
+        sys.exit(0)
 
     setup_pid_file()
     logger = logging.getLogger('server')