Index: third_party/buildbot_8_4p1/README.chromium |
diff --git a/third_party/buildbot_8_4p1/README.chromium b/third_party/buildbot_8_4p1/README.chromium |
index 0aff6bdf69268d937f72179d6c9c10e6b63186c7..188acf3c38a27a0ffac5d606e06c809e5d741476 100644 |
--- a/third_party/buildbot_8_4p1/README.chromium |
+++ b/third_party/buildbot_8_4p1/README.chromium |
@@ -3981,3 +3981,41 @@ index 0619977..19d6c4d 100644 |
d.errback(failure.Failure(RuntimeError(msg))) |
self._waiters = {} |
+ |
+Date: 2014-07-16 09:52:34 UTC |
+Added logging to the status_json.py |
+ |
+BUG=393856 |
+R=agable@chromium.org |
+ |
+diff --git a/third_party/buildbot_8_4p1/buildbot/status/web/status_json.py b/third_party/buildbot_8_4p1/buildbot/status/web/status_json.py |
+index e7cd932d10a0f874175a8b03bd0a9e29436e2278..1047dd55a791479f7be6143bc5992890eb6c4437 100644 |
+--- a/third_party/buildbot_8_4p1/buildbot/status/web/status_json.py |
++++ b/third_party/buildbot_8_4p1/buildbot/status/web/status_json.py |
+@@ -22,6 +22,7 @@ import os |
+ import re |
+ |
+ from twisted.internet import defer |
++from twisted.python import log as twlog |
+ from twisted.web import html, resource, server |
+ |
+ from buildbot.status.web.base import HtmlResource |
+@@ -162,6 +163,10 @@ class JsonResource(resource.Resource): |
+ |
+ def render_GET(self, request): |
+ """Renders a HTTP GET at the http request level.""" |
++ userAgent = request.requestHeaders.getRawHeaders( |
++ 'user-agent', ['unknown'])[0] |
++ twlog.msg('Received request for %s from %s, id: %s' % |
++ (request.uri, userAgent, id(request))) |
+ d = defer.maybeDeferred(lambda : self.content(request)) |
+ def handle(data): |
+ if isinstance(data, unicode): |
+@@ -183,6 +188,7 @@ class JsonResource(resource.Resource): |
+ return data |
+ d.addCallback(handle) |
+ def ok(data): |
++ twlog.msg('Finished processing request with id: %s' % id(request)) |
+ request.write(data) |
+ request.finish() |
+ def fail(f): |