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..1047dd55a791479f7be6143bc5992890
eb6c4437 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 @@ -22,6 +22,7 @@ import os |
| 3996 import re |
| 3997 |
| 3998 from twisted.internet import defer |
| 3999 +from twisted.python import log as twlog |
| 4000 from twisted.web import html, resource, server |
| 4001 |
| 4002 from buildbot.status.web.base import HtmlResource |
| 4003 @@ -162,6 +163,10 @@ class JsonResource(resource.Resource): |
| 4004 |
| 4005 def render_GET(self, request): |
| 4006 """Renders a HTTP GET at the http request level.""" |
| 4007 + userAgent = request.requestHeaders.getRawHeaders( |
| 4008 + 'user-agent', ['unknown'])[0] |
| 4009 + twlog.msg('Received request for %s from %s, id: %s' % |
| 4010 + (request.uri, userAgent, id(request))) |
| 4011 d = defer.maybeDeferred(lambda : self.content(request)) |
| 4012 def handle(data): |
| 4013 if isinstance(data, unicode): |
| 4014 @@ -183,6 +188,7 @@ class JsonResource(resource.Resource): |
| 4015 return data |
| 4016 d.addCallback(handle) |
| 4017 def ok(data): |
| 4018 + twlog.msg('Finished processing request with id: %s' % id(request)) |
| 4019 request.write(data) |
| 4020 request.finish() |
| 4021 def fail(f): |
OLD | NEW |