diff --git a/docker/entrypoint.py b/docker/entrypoint.py index 57038fd..e534cc0 100755 --- a/docker/entrypoint.py +++ b/docker/entrypoint.py @@ -11,12 +11,13 @@ import sys PYTHON3 = '/usr/bin/python3' dbPath = os.path.join(os.sep, 'home', 'py-kms', 'db', 'pykms_database.db') -log_level = os.getenv('LOGLEVEL', 'INFO') - +log_level_bootstrap = log_level = os.getenv('LOGLEVEL', 'INFO') +if log_level_bootstrap == "MININFO": + log_level_bootstrap = "INFO" loggersrv = logging.getLogger('logsrv') -loggersrv.setLevel(log_level) +loggersrv.setLevel(log_level_bootstrap) streamhandler = logging.StreamHandler(sys.stdout) -streamhandler.setLevel(log_level) +streamhandler.setLevel(log_level_bootstrap) formatter = logging.Formatter(fmt = '\x1b[94m%(asctime)s %(levelname)-8s %(message)s', datefmt = '%a, %d %b %Y %H:%M:%S',) streamhandler.setFormatter(formatter) diff --git a/docker/start.py b/docker/start.py index 625cf2f..5d6cf1d 100644 --- a/docker/start.py +++ b/docker/start.py @@ -23,7 +23,9 @@ argumentVariableMapping = { sqliteWebPath = '/home/sqlite_web/sqlite_web.py' enableSQLITE = os.path.isfile(sqliteWebPath) and os.environ.get('SQLITE', 'false').lower() == 'true' dbPath = os.path.join(os.sep, 'home', 'py-kms', 'db', 'pykms_database.db') -log_level = os.getenv('LOGLEVEL', 'INFO') +log_level_bootstrap = log_level = os.getenv('LOGLEVEL', 'INFO') +if log_level_bootstrap == "MININFO": + log_level_bootstrap = "INFO" log_file = os.environ.get('LOGFILE', 'STDOUT') listen_ip = os.environ.get('IP', '0.0.0.0') listen_port = os.environ.get('PORT', '1688') @@ -87,9 +89,9 @@ def start_kms(): # Main if (__name__ == "__main__"): loggersrv = logging.getLogger('logsrv') - loggersrv.setLevel(log_level) + loggersrv.setLevel(log_level_bootstrap) streamhandler = logging.StreamHandler(sys.stdout) - streamhandler.setLevel(log_level) + streamhandler.setLevel(log_level_bootstrap) formatter = logging.Formatter(fmt='\x1b[94m%(asctime)s %(levelname)-8s %(message)s', datefmt='%a, %d %b %Y %H:%M:%S') streamhandler.setFormatter(formatter)