From b356d6ceedeb840115f116f3574e67f42c6b0c85 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Sat, 5 Oct 2019 07:45:43 -0700 Subject: [PATCH] Add debug env variable Allow setting the debug flag from an environment variable for the convenience of users running in a container. Also standardize the log format. Change-Id: Icbf344029745938c69c43805484fb7d676d797fb --- zuul_registry/main.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/zuul_registry/main.py b/zuul_registry/main.py index 64433af..f83fd7d 100644 --- a/zuul_registry/main.py +++ b/zuul_registry/main.py @@ -14,6 +14,7 @@ # along with this software. If not, see . import argparse +import os import sys import logging import cherrypy @@ -332,10 +333,11 @@ def main(): help='Command: serve, prune', default='serve') args = parser.parse_args() - if args.debug: - logging.basicConfig(level=logging.DEBUG) + logformat = '%(levelname)s %(name)s: %(message)s' + if args.debug or os.environ.get('DEBUG') == '1': + logging.basicConfig(level=logging.DEBUG, format=logformat) else: - logging.basicConfig(level=logging.INFO) + logging.basicConfig(level=logging.INFO, format=logformat) cherrypy.log.access_log.propagate = False logging.getLogger("requests").setLevel(logging.DEBUG) logging.getLogger("keystoneauth").setLevel(logging.ERROR)