particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

clean up plugin logging

Browse source
This commit is contained in:
Mike Bonnet 2013-06-11 19:11:43 -04:00
parent 0a7cff19c9
commit b5da4d0587
1 changed files with 4 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
koji/plugin.py
View file

@ -24,12 +24,6 @@ import logging
import sys
import traceback
# set this up for use by the plugins
# we want log output to go to Apache's error_log
logger = logging.getLogger('koji.plugin')
logger.addHandler(logging.StreamHandler(sys.stderr))
logger.setLevel(logging.INFO)
# the available callback hooks and a list
# of functions to be called for each event
callbacks = {
@ -164,9 +158,9 @@ def run_callbacks(cbtype, *args, **kws):
try:
func(cbtype, *args, **kws)
except:
tb = ''.join(traceback.format_exception(*sys.exc_info()))
msg = 'Error running %s callback from %s: %s' % (cbtype, func.__module__, tb)
msg = 'Error running %s callback from %s' % (cbtype, func.__module__)
if getattr(func, 'failure_is_an_option', False):
logging.getLogger('koji.plugin').warn('%s: %s' % (msg, tb))
logging.getLogger('koji.plugin').warn(msg, exc_info=True)
else:
raise koji.CallbackError, msg
tb = ''.join(traceback.format_exception(*sys.exc_info()))
raise koji.CallbackError, '%s:\n%s' % (msg, tb)