From d2476c918736c1aee9a5539722b397e659a84370 Mon Sep 17 00:00:00 2001 From: Joseph Schorr Date: Thu, 4 Jan 2018 13:09:26 -0500 Subject: [PATCH] Have builder follow the logging configuration Also fixes a few lint errors --- buildman/builder.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/buildman/builder.py b/buildman/builder.py index 08f5f733a..1df80cf95 100644 --- a/buildman/builder.py +++ b/buildman/builder.py @@ -1,10 +1,12 @@ import logging import os -import features import time import socket +import features + from app import app, userfiles as user_files, build_logs, dockerfile_build_queue +from util.log import logfile_path from buildman.manager.enterprise import EnterpriseManager from buildman.manager.ephemeral import EphemeralBuilderManager @@ -77,13 +79,13 @@ def run_build_manager(): server.run('0.0.0.0', websocket_port, controller_port, ssl=ssl_context) if __name__ == '__main__': - logging.basicConfig(level=logging.DEBUG, format=LOG_FORMAT) + logging.config.fileConfig(logfile_path(debug=True), disable_existing_loggers=False) logging.getLogger('peewee').setLevel(logging.WARN) logging.getLogger('boto').setLevel(logging.WARN) if app.config.get('EXCEPTION_LOG_TYPE', 'FakeSentry') == 'Sentry': buildman_name = '%s:buildman' % socket.gethostname() setup_logging(SentryHandler(app.config.get('SENTRY_DSN', ''), name=buildman_name, - level=logging.ERROR)) + level=logging.ERROR)) run_build_manager()