Merge 9196f55 into 4f054c6

master/buildbot/buildslave/__init__.py

@@ -824,7 +824,7 @@ def substantiate(self, sb, build):
             self.substantiation_build = build
             if self.slave is None:
                 d = self._substantiate(build) # start up instance
-                d.addErrback(log.err, "while substantiating")
+                d.addErrback(klog.err_json, "while substantiating")
             # else: we're waiting for an old one to detach.  the _substantiate
             # will be done in ``detached`` below.
         return self.substantiation_deferred
@@ -867,7 +867,7 @@ def detached(self, mind):
         AbstractBuildSlave.detached(self, mind)
         if self.substantiation_deferred is not None:
             d = self._substantiate(self.substantiation_build)
-            d.addErrback(log.err, 'while re-substantiating')
+            d.addErrback(klog.err_json, 'while re-substantiating')
 
     def _substantiation_failed(self, failure):
         self.missing_timer = None

master/buildbot/changes/base.py

@@ -18,6 +18,7 @@
 from twisted.internet import defer, task, reactor
 from twisted.python import log
 
+import klog
 from buildbot.interfaces import IChangeSource
 from buildbot import util
 
@@ -59,7 +60,7 @@ def doPoll(self):
         then the 2nd invocation won't start until the 1st has finished.
         """
         d = defer.maybeDeferred(self.poll)
-        d.addErrback(log.err, 'while polling for changes')
+        d.addErrback(klog.err_json, 'while polling for changes')
         return d
 
     def poll(self):

master/buildbot/changes/custom/gitpoller.py

@@ -18,6 +18,7 @@
 from twisted.python import log
 from twisted.internet import defer, utils
 
+import klog
 from buildbot.changes import base
 from buildbot.util import epoch2datetime
 from buildbot.util.state import StateMixin
@@ -84,7 +85,7 @@ def setLastRev(lastRev):
 
         d.addCallback(lambda _:
         base.PollingChangeSource.startService(self))
-        d.addErrback(log.err, 'while initializing GitPoller repository')
+        d.addErrback(klog.err_json, 'while initializing GitPoller repository')
 
         return d
 
@@ -338,5 +339,5 @@ def _stopOnFailure(self, f):
         "utility method to stop the service when a failure occurs"
         if self.running:
             d = defer.maybeDeferred(lambda : self.stopService())
-            d.addErrback(log.err, 'while stopping broken GitPoller service')
+            d.addErrback(klog.err_json, 'while stopping broken GitPoller service')
         return f

master/buildbot/changes/custom/hgpoller.py

@@ -85,7 +85,7 @@ def setLastRev(lastRev):
 
         d.addCallback(lambda _:
         base.PollingChangeSource.startService(self))
-        d.addErrback(log.err, 'while initializing HgPoller repository')
+        d.addErrback(klog.err_json, 'while initializing HgPoller repository')
 
         return d
 
@@ -338,5 +338,5 @@ def _stopOnFailure(self, f):
         "utility method to stop the service when a failure occurs"
         if self.running:
             d = defer.maybeDeferred(lambda : self.stopService())
-            d.addErrback(log.err, 'while stopping broken HgPoller service')
+            d.addErrback(klog.err_json, 'while stopping broken HgPoller service')
         return f

master/buildbot/changes/gerritchangesource.py

@@ -15,6 +15,7 @@
 
 from twisted.internet import reactor
 
+import klog
 from buildbot.changes import base
 from buildbot.util import json
 from buildbot import util
@@ -115,7 +116,7 @@ def flatten(properties, base, event):
     def addChange(self, chdict):
         d = self.master.addChange(**chdict)
         # eat failures..
-        d.addErrback(log.err, 'error adding change from GerritChangeSource')
+        d.addErrback(klog.err_json, 'error adding change from GerritChangeSource')
         return d
     def eventReceived_patchset_created(self, properties, event):
         change = event["change"]

master/buildbot/changes/gitpoller.py

@@ -86,7 +86,7 @@ def setLastRev(lastRev):
 
         d.addCallback(lambda _:
                 base.PollingChangeSource.startService(self))
-        d.addErrback(log.err, 'while initializing GitPoller repository')
+        d.addErrback(klog.err_json, 'while initializing GitPoller repository')
 
         return d
 

master/buildbot/changes/hgpoller.py

@@ -302,5 +302,5 @@ def _stopOnFailure(self, f):
         "utility method to stop the service when a failure occurs"
         if self.running:
             d = defer.maybeDeferred(lambda : self.stopService())
-            d.addErrback(log.err, 'while stopping broken HgPoller service')
+            d.addErrback(klog.err_json, 'while stopping broken HgPoller service')
         return f

master/buildbot/changes/p4poller.py

@@ -24,6 +24,7 @@
 from twisted.python import log
 from twisted.internet import defer, utils
 
+import klog
 from buildbot import util
 from buildbot.changes import base
 
@@ -91,7 +92,7 @@ def describe(self):
 
     def poll(self):
         d = self._poll()
-        d.addErrback(log.err, 'P4 poll failed')
+        d.addErrback(klog.err_json, 'P4 poll failed')
         return d
 
     def _get_process_output(self, args):

master/buildbot/changes/svnpoller.py

@@ -178,7 +178,7 @@ def set_prefix(prefix):
         d.addCallback(self.create_changes)
         d.addCallback(self.submit_changes)
         d.addCallback(self.finished_ok)
-        d.addErrback(log.err, 'SVNPoller: Error in  while polling') # eat errors
+        d.addErrback(klog.err_json, 'SVNPoller: Error in  while polling') # eat errors
         return d
 
     def getProcessOutput(self, args):

master/buildbot/clients/tryclient.py

@@ -905,7 +905,7 @@ def run(self):
             d.addCallback(lambda res: self.announce("job has been delivered"))
             d.addCallback(lambda res: self.getStatus())
         d.addErrback(self.trapSystemExit)
-        d.addErrback(log.err)
+        d.addErrback(klog.err_json)
         d.addCallback(self.cleanup)
         d.addCallback(lambda res: reactor.stop())
 

master/buildbot/master.py

@@ -282,7 +282,7 @@ def cleanup(res):
                 self.reconfig()
             return res
 
-        d.addErrback(log.err, 'while reconfiguring')
+        d.addErrback(klog.err_json, 'while reconfiguring')
 
         return d # for tests
 
@@ -714,9 +714,9 @@ def pollDatabase(self):
         # simultaneously.  Each particular poll method handles errors itself,
         # although catastrophic errors are handled here
         d = defer.gatherResults([
-            self.pollDatabaseChanges().addErrback(log.err,
+            self.pollDatabaseChanges().addErrback(klog.err_json,
                 "while polling changes"),
-            self.pollDatabaseBuildRequests().addErrback(log.err,
+            self.pollDatabaseBuildRequests().addErrback(klog.err_json,
                 "while polling build requests"),
             # also unclaim
         ])

master/buildbot/process/botmaster.py

@@ -116,7 +116,7 @@ def shutdown(ign):
             else:
                 self.brd.startService()
         d.addCallback(shutdown)
-        d.addErrback(log.err, 'while processing cleanShutdown')
+        d.addErrback(klog.err_json, 'while processing cleanShutdown')
 
     def cancelCleanShutdown(self):
         """Cancel a clean shutdown that is already in progress, if any"""

master/buildbot/process/builder.py

@@ -126,7 +126,7 @@ def stopService(self):
         if self.building:
             for b in self.building:
                 d.addCallback(self._resubmit_buildreqs, b.requests)
-                d.addErrback(log.err)
+                d.addErrback(klog.err_json)
         return d
 
     def __repr__(self):
@@ -169,7 +169,7 @@ def reclaimAllBuilds(self):
             return defer.succeed(None)
 
         d = self.master.db.buildrequests.reclaimBuildRequests(brids)
-        d.addErrback(log.err, 'while re-claiming running BuildRequests')
+        d.addErrback(klog.err_json, 'while re-claiming running BuildRequests')
         return d
 
     def getBuild(self, number):
@@ -525,7 +525,7 @@ def run_cleanups():
                 bs, self.expectations, slavebuilder)
         d.addCallback(self.buildFinished, slavebuilder, bids)
         # this shouldn't happen. if it does, the slave will be wedged
-        d.addErrback(log.err, 'from a running build; this is a '
+        d.addErrback(klog.err_json, 'from a running build; this is a '
             'serious error - please file a bug at http://buildbot.net')
 
         # make sure the builder's status is represented correctly
@@ -623,13 +623,13 @@ def finishBuildRequests(self, brids, requests, build, bids=None, mergedbrids=Non
 
         # TODO: we should probably do better error handle
         d.addCallback(lambda _: self.master.db.builds.finishedMergedBuilds(mergedbrids, build.build_status.number))
-        d.addErrback(log.err, 'while marking builds as finished (ignored)')
+        d.addErrback(klog.err_json, 'while marking builds as finished (ignored)')
         d.addCallback(lambda _: self.master.db.buildrequests.maybeUpdateMergedBrids(mergedbrids))
 
         results = build.build_status.getResults()
         if results == RETRY:
             d.addCallback(lambda _: self._resubmit_buildreqs(requests=requests))
-            d.addErrback(log.err, 'while resubmitting build requests')
+            d.addErrback(klog.err_json, 'while resubmitting build requests')
         else:
             db = self.master.db
             if results == RESUME:

master/buildbot/process/buildrequest.py

@@ -14,6 +14,7 @@
 # Copyright Buildbot Team Members
 
 import calendar
+import klog
 from zope.interface import implements
 from twisted.python import log
 from twisted.internet import defer
@@ -309,4 +310,4 @@ def cancel(self):
                     d.addCallback(lambda _:
                                   self.original_builder.builder_status.cancelBuildOnResume(brsdict['lastBuildNumber']))
 
-            d.addErrback(log.err, 'while cancelling build request')
+            d.addErrback(klog.err_json, 'while cancelling build request')

master/buildbot/process/buildrequestdistributor.py

@@ -947,7 +947,7 @@ def maybeStartBuildsOn(self, new_builders):
         def remove(x):
             self._pendingMSBOCalls.remove(d)
             return x
-        d.addErrback(log.err, "while strting builds on %s" % (new_builders,))
+        d.addErrback(klog.err_json, "while strting builds on %s" % (new_builders,))
 
     def _maybeStartBuildsOn(self, new_builders):
         new_builders = set(new_builders)
@@ -1176,7 +1176,7 @@ def maybeStartBuildsOn(self, new_builders):
         def remove(x):
             self._pendingMSBOCalls.remove(d)
             return x
-        d.addErrback(log.err, "while starting or resuming builds on %s" % (new_builders,))
+        d.addErrback(klog.err_json, "while starting or resuming builds on %s" % (new_builders,))
 
     @defer.inlineCallbacks
     def _maybeStartOrResumeBuildsOn(self, new_builders):

master/buildbot/process/buildstep.py

@@ -1055,7 +1055,7 @@ def interrupt(self, reason):
 
         if self.cmd:
             d = self.cmd.interrupt(reason)
-            d.addErrback(log.err, 'while interrupting command')
+            d.addErrback(klog.err_json, 'while interrupting command')
 
     def checkDisconnect(self, f):
         f.trap(error.ConnectionLost)

master/buildbot/schedulers/base.py

@@ -260,7 +260,7 @@ def changeCallback(change):
             # use change_consumption_lock to ensure the service does not stop
             # while this change is being processed
             d = self._change_consumption_lock.run(self.gotChange, change, important)
-            d.addErrback(log.err, 'while processing change')
+            d.addErrback(klog.err_json, 'while processing change')
         self._change_subscription = self.master.subscribeToChanges(changeCallback)
 
         return defer.succeed(None)

master/buildbot/schedulers/basic.py

@@ -13,6 +13,7 @@
 #
 # Copyright Buildbot Team Members
 
+import klog
 from twisted.internet import defer, reactor
 from twisted.python import log
 from buildbot import util, config
@@ -89,8 +90,7 @@ def startService(self, _returnDeferred=False):
                 self.scanExistingClassifiedChanges())
 
         # handle Deferred errors, since startService does not return a Deferred
-        d.addErrback(log.err, "while starting SingleBranchScheduler '%s'"
-                              % self.name)
+        d.addErrback(klog.err_json, "while starting SingleBranchScheduler '%s'" % self.name)
 
         if _returnDeferred:
             return d # only used in tests
@@ -133,7 +133,7 @@ def fix_timer(_):
                 self._stable_timers[timer_name].cancel()
             def fire_timer():
                 d = self.stableTimerFired(timer_name)
-                d.addErrback(log.err, "while firing stable timer")
+                d.addErrback(klog.err_json, "while firing stable timer")
             self._stable_timers[timer_name] = self._reactor.callLater(
                     self.treeStableTimer, fire_timer)
         d.addCallback(fix_timer)

master/buildbot/schedulers/dependent.py

@@ -13,6 +13,7 @@
 #
 # Copyright Buildbot Team Members
 
+import klog
 from twisted.internet import defer
 from twisted.python import log
 from buildbot import util, interfaces, config
@@ -47,7 +48,7 @@ def startService(self):
 
         # check for any buildsets completed before we started
         d = self._checkCompletedBuildsets(None, None)
-        d.addErrback(log.err, 'while checking for completed buildsets in start')
+        d.addErrback(klog.err_json, 'while checking for completed buildsets in start')
 
     def stopService(self):
         if self._buildset_addition_subscr:
@@ -67,11 +68,11 @@ def _buildsetAdded(self, bsid=None, properties=None, **kwargs):
 
         # record our interest in this buildset
         d = self._addUpstreamBuildset(bsid)
-        d.addErrback(log.err, 'while subscribing to buildset %d' % bsid)
+        d.addErrback(klog.err_json, 'while subscribing to buildset %d' % bsid)
 
     def _buildsetCompleted(self, bsid, result):
         d = self._checkCompletedBuildsets(bsid, result)
-        d.addErrback(log.err, 'while checking for completed buildsets')
+        d.addErrback(klog.err_json, 'while checking for completed buildsets')
 
     @util.deferredLocked('_subscription_lock')
     @defer.inlineCallbacks

master/buildbot/schedulers/timed.py

@@ -15,6 +15,7 @@
 
 from zope.interface import implements
 
+import klog
 from buildbot import util
 from buildbot.interfaces import ITriggerableScheduler
 from buildbot.process import buildstep, properties
@@ -81,7 +82,7 @@ def set_last(lastActuated):
         d.addCallback(lambda _ : self.startTimedSchedulerService())
 
         # startService does not return a Deferred, so handle errors with a traceback
-        d.addErrback(log.err, "while initializing %s '%s'" %
+        d.addErrback(klog.err_json, "while initializing %s '%s'" %
                 (self.__class__.__name__, self.name))
 
     def startTimedSchedulerService(self):
@@ -194,8 +195,8 @@ def set_state_and_start():
         d = self.actuationLock.run(set_state_and_start)
 
         # this function can't return a deferred, so handle any failures via
-        # log.err
-        d.addErrback(log.err, 'while actuating')
+        # klog.err_json
+        d.addErrback(klog.err_json, 'while actuating')
 
 
 class Periodic(Timed):

master/buildbot/status/buildrequest.py

@@ -13,6 +13,7 @@
 #
 # Copyright Buildbot Team Members
 
+import klog
 from zope.interface import implements
 from twisted.python import log
 from twisted.internet import defer
@@ -124,7 +125,7 @@ def notify_old(oldbuilds):
         d.addCallback(notify_old)
         d.addCallback(lambda _ :
             self.status._buildrequest_subscribe(self.brid, observer))
-        d.addErrback(log.err, 'while notifying subscribers')
+        d.addErrback(klog.err_json, 'while notifying subscribers')
 
     def unsubscribe(self, observer):
         self.status._buildrequest_unsubscribe(self.brid, observer)

master/buildbot/status/master.py

@@ -591,7 +591,7 @@ def do_notifies(bsdict):
                 for d in self._buildset_finished_waiters.pop(bsid):
                     eventually(d.callback, bss)
         d.addCallback(do_notifies)
-        d.addErrback(log.err, 'while notifying for buildset finishes')
+        d.addErrback(klog.err_json, 'while notifying for buildset finishes')
 
     def _builder_subscribe(self, buildername, watcher):
         # should get requestSubmitted and requestCancelled
@@ -609,7 +609,7 @@ def do_notifies(bsdict):
                 if hasattr(t, 'buildsetSubmitted'):
                     t.buildsetSubmitted(bss)
         d.addCallback(do_notifies)
-        d.addErrback(log.err, 'while notifying buildsetSubmitted')
+        d.addErrback(klog.err_json, 'while notifying buildsetSubmitted')
 
     def _buildsetCompletionCallback(self, bsid, result):
         self._maybeBuildsetFinished(bsid)