Cédric Krier pushed to branch branch/default at Tryton / Tryton
Commits:
ac7f68f8 by Cédric Krier at 2023-07-11T22:49:25+02:00
Use environment variable as default for command line logging options
- - - - -
eb12e191 by Cédric Krier at 2023-07-11T22:50:52+02:00
Use environment variable as default for command line coroutine option
- - - - -
1 changed file:
- trytond/trytond/commandline.py
Changes:
=====================================
trytond/trytond/commandline.py
=====================================
@@ -52,6 +52,7 @@
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 @@
"-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
@@ -71,7 +73,9 @@
parser = get_parser()
parser.add_argument("--pidfile", dest="pidfile", metavar='FILE',
help="file where the server pid will be stored")
- parser.add_argument("--coroutine", action="store_true", dest="coroutine",
+ parser.add_argument(
+ "--coroutine", action="store_true", dest="coroutine",
+ default=bool(os.environ.get('TRYTOND_COROUTINE', False)),
help="use coroutine for concurrency")
return parser
@@ -172,7 +176,11 @@
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)
View it on Heptapod:
https://foss.heptapod.net/tryton/tryton/-/compare/1a79f3058e6cf82c0a9a0bee19eff9703b041f3d...eb12e1918d3df3acd47d8cdda08aac7fea10f00e
--
View it on Heptapod:
https://foss.heptapod.net/tryton/tryton/-/compare/1a79f3058e6cf82c0a9a0bee19eff9703b041f3d...eb12e1918d3df3acd47d8cdda08aac7fea10f00e
You're receiving this email because of your account on foss.heptapod.net.
