[TYPO] Set the right category for the Point Of Sale

[odoo/odoo.git] / openerp-server

diff --git a/openerp-server b/openerp-server
index d2478d0..12b6962 100755 (executable)
--- a/openerp-server
+++ b/openerp-server
@@ -27,9 +27,10 @@ OpenERP is an ERP+CRM program for small and medium businesses.
 The whole source code is distributed under the terms of the
 GNU Public Licence.
 
 The whole source code is distributed under the terms of the
 GNU Public Licence.
 

-(c) 2003-TODAY, Fabien Pinckaers - OpenERP s.a.
+(c) 2003-TODAY, Fabien Pinckaers - OpenERP SA

 """
 
 """
 

+import imp

 import logging
 import os
 import signal
 import logging
 import os
 import signal

@@ -42,6 +43,9 @@ import openerp
 __author__ = openerp.release.author
 __version__ = openerp.release.version
 
 __author__ = openerp.release.author
 __version__ = openerp.release.version
 

+# Also use the `openerp` logger for the main script.
+_logger = logging.getLogger('openerp')
+

 def check_root_user():
     """ Exit if the process's user is 'root' (on POSIX system)."""
     if os.name == 'posix':
 def check_root_user():
     """ Exit if the process's user is 'root' (on POSIX system)."""
     if os.name == 'posix':

@@ -66,13 +70,12 @@ def report_configuration():
     This function assumes the configuration has been initialized.
     """
     config = openerp.tools.config
     This function assumes the configuration has been initialized.
     """
     config = openerp.tools.config

-    logger = logging.getLogger('server')
-    logger.info("OpenERP version %s", __version__)
+    _logger.info("OpenERP version %s", __version__)

     for name, value in [('addons paths', config['addons_path']),
                         ('database hostname', config['db_host'] or 'localhost'),
                         ('database port', config['db_port'] or '5432'),
                         ('database user', config['db_user'])]:
     for name, value in [('addons paths', config['addons_path']),
                         ('database hostname', config['db_host'] or 'localhost'),
                         ('database port', config['db_port'] or '5432'),
                         ('database user', config['db_user'])]:

-        logger.info("%s: %s", name, value)
+        _logger.info("%s: %s", name, value)

 
 def setup_pid_file():
     """ Create a file with the process id written in it.
 
 def setup_pid_file():
     """ Create a file with the process id written in it.

@@ -88,30 +91,36 @@ def setup_pid_file():
 
 def preload_registry(dbname):
     """ Preload a registry, and start the cron."""
 
 def preload_registry(dbname):
     """ Preload a registry, and start the cron."""

-    db, pool = openerp.pooler.get_db_and_pool(dbname, update_module=config['init'] or config['update'], pooljobs=False)
-    pool.get('ir.cron').restart(db.dbname)
+    try:
+        db, registry = openerp.pooler.get_db_and_pool(dbname, update_module=config['init'] or config['update'], pooljobs=False)
+
+        # jobs will start to be processed later, when openerp.cron.start_master_thread() is called by openerp.service.start_services()
+        registry.schedule_cron_jobs()
+    except Exception:
+        _logger.exception('Failed to initialize database `%s`.', dbname)

 
 def run_test_file(dbname, test_file):
     """ Preload a registry, possibly run a test file, and start the cron."""
 
 def run_test_file(dbname, test_file):
     """ Preload a registry, possibly run a test file, and start the cron."""

-    db, pool = openerp.pooler.get_db_and_pool(dbname, update_module=config['init'] or config['update'], pooljobs=False)
+    try:
+        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', True)
+        cr.rollback()
+        cr.close()
+    except Exception:
+        _logger.exception('Failed to initialize database `%s` and run test file `%s`.', dbname, test_file)

 
 

-    cr = db.cursor()
-    logger = logging.getLogger('server')
-    logger.info('loading test file %s', test_file)
-    openerp.tools.convert_yaml_import(cr, 'base', file(test_file), {}, 'test', True)
-    cr.rollback()
-    cr.close()

 
 def export_translation():
     config = openerp.tools.config
     dbname = config['db_name']
 
 def export_translation():
     config = openerp.tools.config
     dbname = config['db_name']

-    logger = logging.getLogger('server')

 
     if config["language"]:
         msg = "language %s" % (config["language"],)
     else:
         msg = "new language"
 
     if config["language"]:
         msg = "language %s" % (config["language"],)
     else:
         msg = "new language"

-    logger.info('writing translation file for %s to %s', msg,
+    _logger.info('writing translation file for %s to %s', msg,

         config["translate_out"])
 
     fileformat = os.path.splitext(config["translate_out"])[-1][1:].lower()
         config["translate_out"])
 
     fileformat = os.path.splitext(config["translate_out"])[-1][1:].lower()

@@ -122,7 +131,7 @@ def export_translation():
     cr.close()
     buf.close()
 
     cr.close()
     buf.close()
 

-    logger.info('translation file written successfully')
+    _logger.info('translation file written successfully')

 
 def import_translation():
     config = openerp.tools.config
 
 def import_translation():
     config = openerp.tools.config

@@ -132,31 +141,9 @@ def import_translation():
     cr = openerp.pooler.get_db(dbname).cursor()
     openerp.tools.trans_load( cr, config["translate_in"], config["language"],
         context=context)
     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()
 
     cr.commit()
     cr.close()
 

-def start_services():
-    http_server = openerp.service.http_server
-    netrpc_server = openerp.service.netrpc_server
-
-    # Instantiate local services (this is a legacy design).
-    openerp.osv.osv.start_object_proxy()
-    # Export (for RPC) services.
-    openerp.service.web_services.start_web_services()
-
-    # Initialize the HTTP stack.
-    http_server.init_servers()
-    http_server.init_xmlrpc()
-    http_server.init_static_http()
-    netrpc_server.init_servers()
-
-    # Start the main cron thread.
-    openerp.netsvc.start_agent()
-
-    # Start the top-level servers threads (normally HTTP, HTTPS, and NETRPC).
-    openerp.netsvc.Server.startAll()
-

 # Variable keeping track of the number of calls to the signal handler defined
 # below. This variable is monitored by ``quit_on_signals()``.
 quit_signals_received = 0
 # Variable keeping track of the number of calls to the signal handler defined
 # below. This variable is monitored by ``quit_on_signals()``.
 quit_signals_received = 0

@@ -178,23 +165,31 @@ def dumpstacks(sig, frame):
     """ Signal handler: dump a stack trace for each existing thread."""
     # code from http://stackoverflow.com/questions/132058/getting-stack-trace-from-a-running-python-application#answer-2569696
     # modified for python 2.5 compatibility
     """ Signal handler: dump a stack trace for each existing thread."""
     # code from http://stackoverflow.com/questions/132058/getting-stack-trace-from-a-running-python-application#answer-2569696
     # modified for python 2.5 compatibility

-    thread_map = dict(threading._active, **threading._limbo)
-    id2name = dict([(threadId, thread.getName()) for threadId, thread in thread_map.items()])
+    threads_info = dict([(th.ident, {'name': th.name,
+                                    'uid': getattr(th,'uid','n/a')})
+                                for th in threading.enumerate()])

     code = []
     for threadId, stack in sys._current_frames().items():
     code = []
     for threadId, stack in sys._current_frames().items():

-        code.append("\n# Thread: %s(%d)" % (id2name[threadId], threadId))
+        thread_info = threads_info.get(threadId)
+        code.append("\n# Thread: %s (id:%s) (uid:%s)" % \
+                    (thread_info and thread_info['name'] or 'n/a',
+                     threadId,
+                     thread_info and thread_info['uid'] or 'n/a'))

         for filename, lineno, name, line in traceback.extract_stack(stack):
             code.append('File: "%s", line %d, in %s' % (filename, lineno, name))
             if line:
                 code.append("  %s" % (line.strip()))
         for filename, lineno, name, line in traceback.extract_stack(stack):
             code.append('File: "%s", line %d, in %s' % (filename, lineno, name))
             if line:
                 code.append("  %s" % (line.strip()))

-    logging.getLogger('dumpstacks').info("\n".join(code))
+    _logger.info("\n".join(code))

 
 def setup_signal_handlers():
     """ Register the signal handler defined above. """
     SIGNALS = map(lambda x: getattr(signal, "SIG%s" % x), "INT TERM".split())
 
 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':
     if os.name == 'posix':

+        map(lambda sig: signal.signal(sig, signal_handler), SIGNALS)

         signal.signal(signal.SIGQUIT, dumpstacks)
         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.
 
 def quit_on_signals():
     """ Wait for one or two signals then shutdown the server.

@@ -204,42 +199,42 @@ def quit_on_signals():
 
     """
     # Wait for a first signal to be handled. (time.sleep will be interrupted
 
     """
     # 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

 
 

-    openerp.netsvc.Agent.quit()
-    openerp.netsvc.Server.quitAll()
-    config = openerp.tools.config

     if config['pidfile']:
         os.unlink(config['pidfile'])
     if config['pidfile']:
         os.unlink(config['pidfile'])

-    logger = logging.getLogger('server')
-    logger.info("Initiating shutdown")
-    logger.info("Hit CTRL-C again or send a second signal to force the sutdown.")
-    logging.shutdown()
-
-    # manually join() all threads before calling sys.exit() to allow a second signal
-    # to trigger _force_quit() in case some non-daemon threads won't exit cleanly.
-    # threading.Thread.join() should not mask signals (at least in python 2.5)
-    for thread in threading.enumerate():
-        if thread != threading.currentThread() and not thread.isDaemon():
-            while thread.isAlive():
-                # need a busyloop here as thread.join() masks signals
-                # and would present the forced shutdown
-                thread.join(0.05)
-                time.sleep(0.05)
+
+    openerp.service.stop_services()

     sys.exit(0)
 
     sys.exit(0)
 

+def configure_babel_localedata_path():
+    # Workaround: py2exe and babel.
+    if hasattr(sys, 'frozen'):
+        import babel
+        babel.localedata._dirname = os.path.join(os.path.dirname(sys.executable), 'localedata')
+

 if __name__ == "__main__":
 
 if __name__ == "__main__":
 

+    os.environ["TZ"] = "UTC"
+

     check_root_user()
     openerp.tools.config.parse_config(sys.argv[1:])
     check_root_user()
     openerp.tools.config.parse_config(sys.argv[1:])

+

     check_postgres_user()
     openerp.netsvc.init_logger()
     report_configuration()
 
     config = openerp.tools.config
 
     check_postgres_user()
     openerp.netsvc.init_logger()
     report_configuration()
 
     config = openerp.tools.config
 

+    configure_babel_localedata_path()
+
+    setup_signal_handlers()
+

     if config["test_file"]:
         run_test_file(config['db_name'], config['test_file'])
         sys.exit(0)
     if config["test_file"]:
         run_test_file(config['db_name'], config['test_file'])
         sys.exit(0)

@@ -252,6 +247,22 @@ if __name__ == "__main__":
         import_translation()
         sys.exit(0)
 
         import_translation()
         sys.exit(0)
 

+    if not config["stop_after_init"]:
+        # Some module register themselves when they are loaded so we need the
+        # services to be running before loading any registry.
+        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(','):
             preload_registry(dbname)
     if config['db_name']:
         for dbname in config['db_name'].split(','):
             preload_registry(dbname)

@@ -259,23 +270,8 @@ if __name__ == "__main__":
     if config["stop_after_init"]:
         sys.exit(0)
 
     if config["stop_after_init"]:
         sys.exit(0)
 

-    for m in openerp.conf.server_wide_modules:
-        __import__(m)
-        # Register a WSGI entry point if any.
-        info = openerp.modules.module.load_information_from_description_file(m)
-        if info['wsgi']:
-            openerp.wsgi.register_wsgi_handler(getattr(sys.modules[m], info['wsgi']))
-
-    openerp.osv.osv.start_object_proxy()
-    openerp.service.web_services.start_web_services()
-    openerp.wsgi.serve()
-
-

     setup_pid_file()
     setup_pid_file()

-    setup_signal_handlers()
-    start_services()
-    logger = logging.getLogger('server')
-    logger.info('OpenERP server is running, waiting for connections...')
+    _logger.info('OpenERP server is running, waiting for connections...')

     quit_on_signals()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
     quit_on_signals()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: