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

kojid logging tweaks

Browse source
This commit is contained in:
Mike McLean 2012-11-06 16:59:49 -05:00
parent a87e1f2c5a
commit f84e579506
2 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
builder/kojid
View file

@ -2909,6 +2909,7 @@ def get_options():
'literal_task_arches': '',
'minspace': 8192,
'admin_emails': None,
'log_level': None,
'topdir': '/mnt/koji',
'topurl': None,
'workdir': '/tmp/koji',
@ -3012,12 +3013,17 @@ if __name__ == "__main__":
koji.add_file_logger("koji", "/var/log/kojid.log")
#note we're setting logging params for all of koji*
options = get_options()
if options.log_level:
lvl = getattr(logging, options.log_level, None)
if lvl is None:
quit("Invalid log level: %s" % options.log_level)
logging.getLogger("koji").setLevel(lvl)
else:
logging.getLogger("koji").setLevel(logging.WARN)
if options.debug:
logging.getLogger("koji").setLevel(logging.DEBUG)
elif options.verbose:
logging.getLogger("koji").setLevel(logging.INFO)
else:
logging.getLogger("koji").setLevel(logging.WARN)
if options.debug_task:
logging.getLogger("koji.build.BaseTaskHandler").setLevel(logging.DEBUG)
if options.admin_emails:

5
koji/__init__.py
View file

@ -1914,7 +1914,10 @@ class ClientSession(object):
if tries > max_retries:
raise
#otherwise keep retrying
self.logger.debug("Try #%d for call %d (%s) failed: %s", tries, self.callnum, name, e)
if self.logger.isEnabledFor(logging.DEBUG):
tb_str = ''.join(traceback.format_exception(*sys.exc_info()))
self.logger.debug(tb_str)
self.logger.info("Try #%d for call %d (%s) failed: %s", tries, self.callnum, name, e)
time.sleep(interval)
#not reached