summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2015-02-11 12:41:27 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2015-02-11 12:53:58 +0000
commit1ce2492256af256e1076f0e88402e8e1d8a271f2 (patch)
treeb2321af5f35f99e6f9e1ec8be3d0c257302de404
parent5bf5bb1d8f719ac6759bbe8affac7665e24acb1e (diff)
downloadmorph-1ce2492256af256e1076f0e88402e8e1d8a271f2.tar.gz
distbuild: Give more detail when requests to cache-server fail
Let the end-user see the URL that distbuild was attempting to talk to, so they can more easily spot configuration errors. It's kind of silly to say 'HTTP request failed' without saying where the request was going.
-rw-r--r--distbuild/build_controller.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/distbuild/build_controller.py b/distbuild/build_controller.py
index aeeda417..6752f400 100644
--- a/distbuild/build_controller.py
+++ b/distbuild/build_controller.py
@@ -361,8 +361,9 @@ class BuildController(distbuild.StateMachine):
http_status_code = event.msg['status']
if http_status_code != httplib.OK:
- self.fail('Failed to annotate build graph: http request got %d: %s'
- % (http_status_code, event.msg['body']))
+ self.fail('Failed to annotate build graph: HTTP request to %s got '
+ '%d: %s' % (self._artifact_cache_server,
+ http_status_code, event.msg['body']))
return
cache_state = json.loads(event.msg['body'])