Merge "Fix bug with removing a failed job"
diff --git a/doc/source/zuul.rst b/doc/source/zuul.rst
index 244c940..4e04b04 100644
--- a/doc/source/zuul.rst
+++ b/doc/source/zuul.rst
@@ -56,6 +56,10 @@
Whether to start the internal Gearman server (default: False).
``start=true``
+**listen_address**
+ IP address or domain name on which to listen (default: all addresses).
+ ``listen_address=127.0.0.1``
+
**log_config**
Path to log config file for internal Gearman server.
``log_config=/etc/zuul/gearman-logging.yaml``
diff --git a/zuul/cmd/server.py b/zuul/cmd/server.py
index 8887d36..2d99a1f 100755
--- a/zuul/cmd/server.py
+++ b/zuul/cmd/server.py
@@ -121,8 +121,12 @@
import gear
statsd_host = os.environ.get('STATSD_HOST')
statsd_port = int(os.environ.get('STATSD_PORT', 8125))
+ if self.config.has_option('gearman_server', 'listen_address'):
+ host = self.config.get('gearman_server', 'listen_address')
+ else:
+ host = None
gear.Server(4730,
- host=self.config.get('gearman', 'server'),
+ host=host,
statsd_host=statsd_host,
statsd_port=statsd_port,
statsd_prefix='zuul.geard')
diff --git a/zuul/scheduler.py b/zuul/scheduler.py
index 2be98ea..41a3a16 100644
--- a/zuul/scheduler.py
+++ b/zuul/scheduler.py
@@ -1363,6 +1363,7 @@
"for change %s" % (build, item.change))
build.result = 'CANCELED'
canceled = True
+ self.updateBuildDescriptions(old_build_set)
for item_behind in item.items_behind:
self.log.debug("Canceling jobs for change %s, behind change %s" %
(item_behind.change, item.change))
@@ -1486,7 +1487,6 @@
def onBuildStarted(self, build):
self.log.debug("Build %s started" % build)
- self.updateBuildDescriptions(build.build_set)
return True
def onBuildCompleted(self, build):
@@ -1496,7 +1496,6 @@
self.pipeline.setResult(item, build)
self.log.debug("Item %s status is now:\n %s" %
(item, item.formatStatus()))
- self.updateBuildDescriptions(build.build_set)
return True
def onMergeCompleted(self, event):