From e3fb65f35acd5b5dd6edd82d766ffc5f96bbc530 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 11 Jul 2023 22:49:25 +0200 Subject: [PATCH] Use environment variable as default for command line logging options --- trytond/trytond/commandline.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/trytond/trytond/commandline.py b/trytond/trytond/commandline.py index c3fba958c7..bfe1436ed3 100644 --- a/trytond/trytond/commandline.py +++ b/trytond/trytond/commandline.py @@ -52,6 +52,7 @@ def get_parser(): parser.add_argument('--dev', dest='dev', action='store_true', help='enable development mode') + logging_config = os.environ.get('TRYTOND_LOGGING_CONFIG') db_names = os.environ.get('TRYTOND_DATABASE_NAMES') if db_names: db_names = list(next(csv.reader(StringIO(db_names)))) @@ -61,7 +62,8 @@ def get_parser(): "-d", "--database", dest="database_names", nargs='+', default=db_names, metavar='DATABASE', help="specify the database name").completer = database_completer - parser.add_argument("--logconf", dest="logconf", metavar='FILE', + parser.add_argument( + "--logconf", dest="logconf", default=logging_config, metavar='FILE', help="logging configuration file (ConfigParser format)") return parser @@ -172,7 +174,11 @@ def config_log(options): else: logformat = ('%(process)s %(thread)s [%(asctime)s] ' '%(levelname)s %(name)s %(message)s') - level = max(logging.ERROR - options.verbose * 10, logging.NOTSET) + if not options.verbose and 'TRYTOND_LOGGING_LEVEL' in os.environ: + logging_level = int(os.environ['TRYTOND_LOGGING_LEVEL']) + level = max(logging_level, logging.NOTSET) + else: + level = max(logging.ERROR - options.verbose * 10, logging.NOTSET) logging.basicConfig(level=level, format=logformat) logging.captureWarnings(True)