| OLD | NEW |
| 1 URL: http://buildbot.net/trac | 1 URL: http://buildbot.net/trac |
| 2 Version: 0.8.4p1 | 2 Version: 0.8.4p1 |
| 3 License: GNU General Public License (GPL) Version 2 | 3 License: GNU General Public License (GPL) Version 2 |
| 4 | 4 |
| 5 This is a forked copy of buildbot v0.8.4p1. | 5 This is a forked copy of buildbot v0.8.4p1. |
| 6 | 6 |
| 7 Make hidden steps stay hidden even if not finished, add brDoStepIf | 7 Make hidden steps stay hidden even if not finished, add brDoStepIf |
| 8 to support buildrunner. | 8 to support buildrunner. |
| 9 | 9 |
| 10 | 10 |
| (...skipping 3963 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3974 +++ b/third_party/buildbot_8_4p1/buildbot/schedulers/triggerable.py | 3974 +++ b/third_party/buildbot_8_4p1/buildbot/schedulers/triggerable.py |
| 3975 @@ -62,7 +62,7 @@ class Triggerable(base.BaseScheduler): | 3975 @@ -62,7 +62,7 @@ class Triggerable(base.BaseScheduler): |
| 3976 # and errback any outstanding deferreds | 3976 # and errback any outstanding deferreds |
| 3977 if self._waiters: | 3977 if self._waiters: |
| 3978 msg = 'Triggerable scheduler stopped before build was complete' | 3978 msg = 'Triggerable scheduler stopped before build was complete' |
| 3979 - for d in self._waiters: | 3979 - for d in self._waiters: |
| 3980 + for d in self._waiters.itervalues(): | 3980 + for d in self._waiters.itervalues(): |
| 3981 d.errback(failure.Failure(RuntimeError(msg))) | 3981 d.errback(failure.Failure(RuntimeError(msg))) |
| 3982 self._waiters = {} | 3982 self._waiters = {} |
| 3983 | 3983 |
| 3984 |
| 3985 Date: 2014-07-16 09:52:34 UTC |
| 3986 Added logging to the status_json.py |
| 3987 |
| 3988 BUG=393856 |
| 3989 R=agable@chromium.org |
| 3990 |
| 3991 diff --git a/third_party/buildbot_8_4p1/buildbot/status/web/status_json.py b/thi
rd_party/buildbot_8_4p1/buildbot/status/web/status_json.py |
| 3992 index e7cd932d10a0f874175a8b03bd0a9e29436e2278..ab68879a573331bd59d0a33ed2be3721
1c8b39e5 100644 |
| 3993 --- a/third_party/buildbot_8_4p1/buildbot/status/web/status_json.py |
| 3994 +++ b/third_party/buildbot_8_4p1/buildbot/status/web/status_json.py |
| 3995 @@ -162,6 +162,10 @@ class JsonResource(resource.Resource): |
| 3996 |
| 3997 def render_GET(self, request): |
| 3998 """Renders a HTTP GET at the http request level.""" |
| 3999 + userAgent = request.requestHeaders.getRawHeaders( |
| 4000 + 'user-agent', ['unknown'])[0] |
| 4001 + print 'Received request for %s from %s, id: %s' % ( |
| 4002 + request.uri, userAgent, id(request)) |
| 4003 d = defer.maybeDeferred(lambda : self.content(request)) |
| 4004 def handle(data): |
| 4005 if isinstance(data, unicode): |
| 4006 @@ -183,6 +187,7 @@ class JsonResource(resource.Resource): |
| 4007 return data |
| 4008 d.addCallback(handle) |
| 4009 def ok(data): |
| 4010 + print 'Finished processing request with id: %s' % id(request) |
| 4011 request.write(data) |
| 4012 request.finish() |
| 4013 def fail(f): |
| OLD | NEW |