X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;ds=sidebyside;f=openerp-server;h=5501eba2159e7606b129cef0a13bbb7e01497643;hb=4c68620d563b625532a476f127aca18ce088089b;hp=60eccd777bc9e66caf1da30dd962b101aa2fe0d3;hpb=fbb36c547c2e720fae74cff35b75da147050b354;p=odoo%2Fodoo.git diff --git a/openerp-server b/openerp-server index 60eccd7..5501eba 100755 --- a/openerp-server +++ b/openerp-server @@ -42,6 +42,9 @@ import openerp __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': @@ -66,13 +69,12 @@ def report_configuration(): 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'])]: - 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. @@ -89,35 +91,35 @@ def setup_pid_file(): def preload_registry(dbname): """ Preload a registry, and start the cron.""" try: - 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) + db, registry = openerp.pooler.get_db_and_pool(dbname, update_module=openerp.tools.config['init'] or openerp.tools.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: - logging.exception('Failed to initialize database `%s`.', dbname) + _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.""" try: - db, pool = openerp.pooler.get_db_and_pool(dbname, update_module=config['init'] or config['update'], pooljobs=False) + config = openerp.tools.config + db, registry = openerp.pooler.get_db_and_pool(dbname, update_module=config['init'] or config['update'], pooljobs=False) 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) + _logger.info('loading test file %s', test_file) + openerp.tools.convert_yaml_import(cr, 'base', file(test_file), 'test', {}, 'test', True) cr.rollback() cr.close() except Exception: - logging.exception('Failed to initialize database `%s` and run test file `%s`.', dbname, test_file) - + _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'] - logger = logging.getLogger('server') 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() @@ -128,7 +130,7 @@ def export_translation(): cr.close() buf.close() - logger.info('translation file written successfully') + _logger.info('translation file written successfully') def import_translation(): config = openerp.tools.config @@ -138,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() @@ -163,23 +164,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 - 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.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())) - 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()) - 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. @@ -189,28 +198,40 @@ 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: + pass + config = openerp.tools.config if config['pidfile']: os.unlink(config['pidfile']) openerp.service.stop_services() sys.exit(0) -if __name__ == "__main__": +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') +def main(): os.environ["TZ"] = "UTC" check_root_user() openerp.tools.config.parse_config(sys.argv[1:]) + check_postgres_user() openerp.netsvc.init_logger() report_configuration() config = openerp.tools.config + configure_babel_localedata_path() + setup_signal_handlers() if config["test_file"]: @@ -226,9 +247,13 @@ if __name__ == "__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. - openerp.service.start_services() + if config['workers']: + openerp.service.start_services_workers() + else: + openerp.service.start_services() if config['db_name']: for dbname in config['db_name'].split(','): @@ -237,19 +262,10 @@ if __name__ == "__main__": if config["stop_after_init"]: sys.exit(0) - for m in openerp.conf.server_wide_modules: - try: - __import__(m) - # Call any post_load hook. - info = openerp.modules.module.load_information_from_description_file(m) - if info['post_load']: - getattr(sys.modules[m], info['post_load'])() - except Exception: - logging.exception('Failed to load server-wide module `%s`', m) - - setup_pid_file() - 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() +if __name__ == "__main__": + main() + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: