diff options
| author | Simon Lejeune <sle@openerp.com> | 2016-09-25 22:27:22 +0200 |
|---|---|---|
| committer | Simon Lejeune <sle@openerp.com> | 2016-09-30 12:05:49 +0200 |
| commit | 630b4b1d556b84649cf7b9bfe7a170114d918a36 (patch) | |
| tree | c878e2313a9f6c0fea0703d19602f575720efaac /odoo/cli | |
| parent | c59eb4ffc1da64333075af9d89a620cb9a037cae (diff) | |
[REF] cli: renamed .rc configuration file
A fallback for .openerp_serverrc has been implemented. If both
are present, Odoo will crash and report.
Diffstat (limited to 'odoo/cli')
| -rw-r--r-- | odoo/cli/server.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/odoo/cli/server.py b/odoo/cli/server.py index da33c6888cd..afb172b7f3c 100644 --- a/odoo/cli/server.py +++ b/odoo/cli/server.py @@ -54,7 +54,9 @@ def report_configuration(): This function assumes the configuration has been initialized. """ config = odoo.tools.config - _logger.info("OpenERP version %s", __version__) + _logger.info("Odoo version %s", __version__) + if os.path.isfile(config.rcfile): + _logger.info("Using configuration file at " + config.rcfile) _logger.info('addons paths: %s', odoo.modules.module.ad_paths) host = config['db_host'] or os.environ.get('PGHOST', 'default') port = config['db_port'] or os.environ.get('PGPORT', 'default') |