summaryrefslogtreecommitdiff
path: root/odoo/cli/server.py
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2016-09-30 17:23:30 +0200
committerChristophe Simonis <chs@odoo.com>2016-09-30 17:23:30 +0200
commitc8cc54559b75a621e4444ecdca6abd901b45e494 (patch)
tree92141325d4dbbf70bbfb8e0c040d4435c8d2378f /odoo/cli/server.py
parentb2804b1d2ae5fd7ec5c0eca79a8db77476badc84 (diff)
parent91a14488250bc2bb405cc6d300359aa272642484 (diff)
[MERGE] forward port branch 10.0 up to 91a1448
Diffstat (limited to 'odoo/cli/server.py')
-rw-r--r--odoo/cli/server.py4
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')