summaryrefslogtreecommitdiff
path: root/zuul/lib/logutil.py
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2019-05-20 22:18:29 +0000
committerGerrit Code Review <review@openstack.org>2019-05-20 22:18:29 +0000
commit6400f2cfa6309641de89b43189220440f46d8dee (patch)
tree8da3dc372b81e37b15e629e6fc2e3e7d40f4f366 /zuul/lib/logutil.py
parentb45b375554cf3583a93fdc723f1b67a1b473a767 (diff)
parente161ffb3bc73809c4e450d92f2bb147d47891e91 (diff)
downloadzuul-6400f2cfa6309641de89b43189220440f46d8dee.tar.gz
Merge "Annotate job freezing logs with event id"
Diffstat (limited to 'zuul/lib/logutil.py')
-rw-r--r--zuul/lib/logutil.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/zuul/lib/logutil.py b/zuul/lib/logutil.py
index 0bf70f887..a874a5498 100644
--- a/zuul/lib/logutil.py
+++ b/zuul/lib/logutil.py
@@ -14,8 +14,6 @@
import logging
-from zuul.model import TriggerEvent
-
def get_annotated_logger(logger, event, build=None):
# Note(tobiash): When running with python 3.5 log adapters cannot be
@@ -26,7 +24,7 @@ def get_annotated_logger(logger, event, build=None):
extra = {}
if event is not None:
- if isinstance(event, TriggerEvent):
+ if hasattr(event, 'zuul_event_id'):
extra['event_id'] = event.zuul_event_id
else:
extra['event_id'] = event