X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=openerp-server;h=12b6962e4e6218028db22f2d104597593dd817f6;hb=11dd44ec360d4130c824bda10bd2bee1f8a31a2c;hp=44ba179830dd05f2d81319b0a77622d22c610989;hpb=1560538f8a336e9e44c35bc8fd9b48b7bc2a2d82;p=odoo%2Fodoo.git diff --git a/openerp-server b/openerp-server index 44ba179..12b6962 100755 --- 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 @@ -42,8 +43,8 @@ import openerp __author__ = openerp.release.author __version__ = openerp.release.version -import sys -import imp +# 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).""" @@ -69,13 +70,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. @@ -97,32 +97,30 @@ def preload_registry(dbname): # 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, 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) + _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: - 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() @@ -133,7 +131,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 @@ -143,7 +141,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() @@ -168,16 +165,21 @@ 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. """ @@ -210,6 +212,12 @@ def quit_on_signals(): openerp.service.stop_services() 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__": os.environ["TZ"] = "UTC" @@ -217,96 +225,14 @@ if __name__ == "__main__": check_root_user() openerp.tools.config.parse_config(sys.argv[1:]) - - class ImportHook(object): - """ - Import hook to load OpenERP addons from multiple paths. - - OpenERP implements its own import-hook to load its addons. OpenERP - addons are Python modules. Originally, they were each living in their - own top-level namespace, e.g. the sale module, or the hr module. For - backward compatibility, `import ` is still supported. Now they - are living in `openerp.addons`. The good way to import such modules is - thus `import openerp.addons.module`. - - For backward compatibility, loading an addons puts it in `sys.modules` - under both the legacy (short) name, and the new (longer) name. This - ensures that - import hr - import openerp.addons.hr - loads the hr addons only once. - - When an OpenERP addons name clashes with some other installed Python - module (for instance this is the case of the `resource` addons), - obtaining the OpenERP addons is only possible with the long name. The - short name will give the expected Python module. - """ - - def find_module(self, module_name, package_path): - module_parts = module_name.split('.') - if len(module_parts) == 3 and module_name.startswith('openerp.modules.'): - return self # We act as a loader too. - - # TODO list of loadable modules can be cached instead of always - # calling get_module_path(). - if len(module_parts) == 1 and \ - openerp.modules.module.get_module_path(module_parts[0], - display_warning=False): - try: - # Check if the bare module name clashes with another module. - f, path, descr = imp.find_module(module_parts[0]) - logger = logging.getLogger('init') - logger.warning(""" - Ambiguous import: the OpenERP module `%s` is shadowed by another - module (available at %s). - To import it, use `import openerp.modules..`.""" % (module_name, path)) - return - except ImportError, e: - # Using `import ` instead of - # `import openerp.modules.` is ugly but not harmful - # and kept for backward compatibility. - return self # We act as a loader too. - - def load_module(self, module_name): - - module_parts = module_name.split('.') - if len(module_parts) == 3 and module_name.startswith('openerp.modules.'): - module_part = module_parts[2] - if module_name in sys.modules: - return sys.modules[module_name] - - if len(module_parts) == 1: - module_part = module_parts[0] - if module_part in sys.modules: - return sys.modules[module_part] - - try: - # Check if the bare module name shadows another module. - f, path, descr = imp.find_module(module_part) - is_shadowing = True - except ImportError, e: - # Using `import ` instead of - # `import openerp.modules.` is ugly but not harmful - # and kept for backward compatibility. - is_shadowing = False - - # Note: we don't support circular import. - f, path, descr = imp.find_module(module_part, openerp.modules.module.ad_paths) - mod = imp.load_module(module_name, f, path, descr) - if not is_shadowing: - sys.modules[module_part] = mod - sys.modules['openerp.modules.' + module_part] = mod - return mod - - openerp.modules.module.initialize_sys_path() - sys.meta_path.append(ImportHook()) - check_postgres_user() openerp.netsvc.init_logger() report_configuration() config = openerp.tools.config + configure_babel_localedata_path() + setup_signal_handlers() if config["test_file"]: @@ -328,18 +254,14 @@ if __name__ == "__main__": 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'])() + 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.""" - logging.exception('Failed to load server-wide module `%s`.%s', m, msg) + _logger.exception('Failed to load server-wide module `%s`.%s', m, msg) if config['db_name']: for dbname in config['db_name'].split(','): @@ -349,8 +271,7 @@ Maybe you forgot to add those addons in your addons_path configuration.""" sys.exit(0) 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() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: