Merge "Improve logging on reconfiguration" into feature/zuulv3
This commit is contained in:
commit
538e34d6f5
|
@ -1167,6 +1167,8 @@ class TenantParser(object):
|
||||||
# This is important for correct inheritance.
|
# This is important for correct inheritance.
|
||||||
TenantParser.log.debug("Waiting for cat job %s" % (job,))
|
TenantParser.log.debug("Waiting for cat job %s" % (job,))
|
||||||
job.wait()
|
job.wait()
|
||||||
|
TenantParser.log.debug("Cat job %s got files %s" %
|
||||||
|
(job, job.files))
|
||||||
loaded = False
|
loaded = False
|
||||||
files = sorted(job.files.keys())
|
files = sorted(job.files.keys())
|
||||||
for conf_root in ['zuul.yaml', '.zuul.yaml', 'zuul.d', '.zuul.d']:
|
for conf_root in ['zuul.yaml', '.zuul.yaml', 'zuul.d', '.zuul.d']:
|
||||||
|
|
|
@ -779,6 +779,7 @@ class Scheduler(threading.Thread):
|
||||||
self.log.error("Unable to handle event %s" % event)
|
self.log.error("Unable to handle event %s" % event)
|
||||||
event.done()
|
event.done()
|
||||||
except Exception:
|
except Exception:
|
||||||
|
self.log.exception("Exception in management event:")
|
||||||
event.exception(sys.exc_info())
|
event.exception(sys.exc_info())
|
||||||
self.management_event_queue.task_done()
|
self.management_event_queue.task_done()
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue