From 6b81f5c30f48205ccbf9fbef0dcdcdb4805b080d Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Oct 09 2014 14:56:56 +0000 Subject: Make logging configurable I want to send email on warnings from the actual instance --- diff --git a/config.cfg.template b/config.cfg.template index 2831f45..d692924 100644 --- a/config.cfg.template +++ b/config.cfg.template @@ -73,5 +73,20 @@ config = { "openid": { "openid_store": "@STATEDIR@/openid", }, + "logging": { + "version": 1, + "loggers": { + "": { + "level": "DEBUG", + "handlers": ["stderr"], + }, + }, + "handlers": { + "stderr": { + "class": "logging.StreamHandler", + "stream": "ext://sys.stderr" + }, + }, + }, } diff --git a/koschei/util.py b/koschei/util.py index 5df05c5..2bd9ad1 100644 --- a/koschei/util.py +++ b/koschei/util.py @@ -19,10 +19,10 @@ from __future__ import print_function import os -import sys import rpm import koji import logging +import logging.config import subprocess import hawkey import librepo @@ -35,11 +35,6 @@ from datetime import datetime from contextlib import contextmanager from sqlalchemy.exc import IntegrityError -root_logger = logging.getLogger() -root_logger.setLevel(logging.DEBUG) -log_handler = logging.StreamHandler(sys.stderr) -root_logger.addHandler(log_handler) - def merge_dict(d1, d2): ret = d1.copy() for k, v in d2.items(): @@ -69,6 +64,7 @@ def load_config(): load_config() assert config != {} +logging.config.dictConfig(config['logging']) log = logging.getLogger('koschei.util') koji_config = config['koji_config']