commit 73ee9d9176831db20412c62eb1f65b833af9835f
author Jenkins <jenkins@review.openstack.org> Tue May 30 21:46:28 2017 +0000
committer Gerrit Code Review <review@openstack.org> Tue May 30 21:46:28 2017 +0000
tree c35b83de211ff3579d6dc30d3f57ff0a8da5aab6
parent a457b475890dceba77c2f7b6e758515711f0f773
parent 2d30758b4e3f011ff18157e0992fe9254e5bc79b

Merge "Include exc_info in reporter failure" into feature/zuulv3

zuul/driver/github/githubreporter.py

diff --git a/zuul/driver/github/githubreporter.py b/zuul/driver/github/githubreporter.py
index 9975cbc..6808bdd 100644
--- a/zuul/driver/github/githubreporter.py
+++ b/zuul/driver/github/githubreporter.py
@@ -102,12 +102,12 @@
                 item.change.is_merged = True
                 return
             except MergeFailure:
-                self.log.debug(
+                self.log.exception(
                     'Merge attempt of change %s  %s/2 failed.' %
-                    (i, item.change))
+                    (item.change, i), exc_info=True)
                 if i == 1:
                     time.sleep(2)
-        self.log.debug(
+        self.log.warning(
             'Merge of change %s failed after 2 attempts, giving up' %
             item.change)