Merge pull request buildbot#4907 from tardyp/github_reporter_erroring

github: Fix error handling in case of bad interpolaters
angeloudy · Jul 25, 2019 · a862079 · a862079
2 parents ce20a96 + b7c8e76
commit a862079
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/master/buildbot/newsfragments/github_reporter_erroring.bugfix b/master/buildbot/newsfragments/github_reporter_erroring.bugfix
@@ -0,0 +1 @@
+Fix Github error reporting to handle exceptions that happen before the http request is sent
diff --git a/master/buildbot/reporters/github.py b/master/buildbot/reporters/github.py
@@ -149,6 +149,7 @@ def send(self, build):
 
         for sourcestamp in sourcestamps:
             sha = sourcestamp['revision']
+            response = None
             try:
                 repo_user = repoOwner
                 repo_name = repoName
@@ -174,15 +175,19 @@ def send(self, build):
                             state=state, repoOwner=repoOwner, repoName=repoName,
                             sha=sha, issue=issue, context=context))
             except Exception as e:
-                content = yield response.content()
+                if response:
+                    content = yield response.content()
+                    code = response.code
+                else:
+                    content = code = "n/a"
                 log.err(
                     e,
                     'Failed to update "{state}" for {repoOwner}/{repoName} '
                     'at {sha}, context "{context}", issue {issue}. '
                     'http {code}, {content}'.format(
                         state=state, repoOwner=repoOwner, repoName=repoName,
                         sha=sha, issue=issue, context=context,
-                        code=response.code, content=content))
+                        code=code, content=content))
 
 
 class GitHubCommentPush(GitHubStatusPush):