# HG changeset patch # User Vincent Hatakeyama <vincent.hatakeyama@xcg-consulting.fr> # Date 1523634292 -7200 # Fri Apr 13 17:44:52 2018 +0200 # Node ID 046b824d140c5891526e4d08af22945bbcfda380 # Parent 7521ce19b344a4919d73378700be87681e3601ab add options for log levels diff --git a/do_tests.py b/do_tests.py --- a/do_tests.py +++ b/do_tests.py @@ -93,6 +93,25 @@ help="Odoo database password [default: %(default)s]", default=None, ) + odoo_log_levels = ['info', 'warn', 'debug'] # TODO there are more + parser.add_argument( + '--log-level', + help="Override odoo log level (for tests and install)", + default=None, + choices=odoo_log_levels, + ) + parser.add_argument( + '--install-log-level', + help="Override odoo log level (for install)", + default='warn', + choices=odoo_log_levels, + ) + parser.add_argument( + '--test-log-level', + help="Override odoo log level (for test)", + default=None, + choices=odoo_log_levels, + ) # TODO options # - db host/uri (include socket) # - db user for creation/remove @@ -112,8 +131,12 @@ odoo_db_password = nmspc.db_password recreate_db = True extensions = [] - install_log_level = None - test_log_level = None + install_log_level = ( + nmspc.log_level + if nmspc.log_level else nmspc.install_log_level) + test_log_level = ( + nmspc.log_level + if nmspc.log_level else nmspc.test_log_level) # Get parameters from setup file @@ -211,7 +234,8 @@ install_args = list(args) install_args.append('--install-default') if install_log_level: - install_args.append('--log-level=%s' % install_log_level) + install_args.append('--log-level') + install_args.append(install_log_level) docker_dev_start.main(install_args) if result: @@ -223,7 +247,8 @@ test_args = list(args) test_args.append('--test-default') if test_log_level: - install_args.append('--log-level=%s' % test_log_level) + test_args.append('--log-level') + test_args.append(test_log_level) return docker_dev_start.main(test_args) else: raise NotImplementedError diff --git a/docker_dev_start.py b/docker_dev_start.py --- a/docker_dev_start.py +++ b/docker_dev_start.py @@ -230,6 +230,13 @@ action='store_false', dest='dev', ) + odoo_log_levels = ['info', 'warn', 'debug'] # TODO there are more + parser.add_argument( + '--log-level', + help="Override odoo log level (for tests and install)", + default=None, + choices=odoo_log_levels, + ) # TODO detect that user is member of docker group @@ -358,6 +365,9 @@ arg.append('--without-demo %s' % nmspc.database) if nmspc.max_cron_threads: arg.append('--max-cron-threads=%s' % nmspc.max_cron_threads) + if nmspc.log_level: + arg.append('--log-level') + arg.append(nmspc.log_level) # auto detect local ip if use_host_network: