[Buildbot-commits] buildbot/buildbot/process base.py, 1.74, 1.75 buildstep.py, 1.7, 1.8
Brian Warner
warner at users.sourceforge.net
Sun Aug 12 22:22:43 UTC 2007
Update of /cvsroot/buildbot/buildbot/buildbot/process
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6009/buildbot/process
Modified Files:
base.py buildstep.py
Log Message:
[project @ BuildSlave: keep track of lastMessageReceived for each slave]
Original author: warner at lothar.com
Date: 2007-08-12 22:15:19+00:00
Index: base.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/process/base.py,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- base.py 18 Jun 2007 02:52:49 -0000 1.74
+++ base.py 12 Aug 2007 22:22:41 -0000 1.75
@@ -354,6 +354,7 @@
% (factory, args))
raise
step.setBuild(self)
+ step.setBuildSlave(self.slavebuilder.slave)
step.setDefaultWorkdir(self.workdir)
name = step.name
count = 1
Index: buildstep.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/process/buildstep.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- buildstep.py 17 Jul 2007 19:48:40 -0000 1.7
+++ buildstep.py 12 Aug 2007 22:22:41 -0000 1.8
@@ -152,6 +152,7 @@
@type updates: list of [object, int]
@param updates: list of updates from the remote command
"""
+ self.buildslave.messageReceivedFromSlave()
max_updatenum = 0
for (update, num) in updates:
#log.msg("update[%d]:" % num)
@@ -179,6 +180,7 @@
@rtype: None
"""
+ self.buildslave.messageReceivedFromSlave()
# call the real remoteComplete a moment later, but first return an
# acknowledgement so the slave can retire the completion message.
if self.active:
@@ -583,6 +585,9 @@
# afterwards.
self.build = build
+ def setBuildSlave(self, buildslave):
+ self.buildslave = buildslave
+
def setDefaultWorkdir(self, workdir):
# the Build calls this just after __init__ and setDefaultWorkdir.
# ShellCommand and variants use a slave-side workdir, but some other
@@ -887,6 +892,7 @@
self.step_status.addURL(name, url)
def runCommand(self, c):
+ c.buildslave = self.buildslave
d = c.run(self, self.remote)
return d
More information about the Commits
mailing list