summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-01-25 17:26:16 +0000
committerGerrit Code Review <review@openstack.org>2019-01-25 17:26:16 +0000
commit1d6d8b0de68512e081f8b32efc4f210b426aebcf (patch)
treec20ff13b82d5ac222de5fe674d30fdbb849ca294
parent8b25219da8e59d843fcb49d271f4c43105c12735 (diff)
parent057374c9a2eeac8ee3dc9cf05850dda9b5df0146 (diff)
Merge "Improve logging around ansible timeouts"
-rw-r--r--zuul/executor/server.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/zuul/executor/server.py b/zuul/executor/server.py
index 73d65b7..038cf06 100644
--- a/zuul/executor/server.py
+++ b/zuul/executor/server.py
@@ -1854,7 +1854,7 @@ class AnsibleJob(object):
1854 ret = None 1854 ret = None
1855 if timeout: 1855 if timeout:
1856 watchdog = Watchdog(timeout, self._ansibleTimeout, 1856 watchdog = Watchdog(timeout, self._ansibleTimeout,
1857 ("Ansible timeout exceeded",)) 1857 ("Ansible timeout exceeded: %s" % timeout,))
1858 watchdog.start() 1858 watchdog.start()
1859 try: 1859 try:
1860 # Use manual idx instead of enumerate so that RESULT lines 1860 # Use manual idx instead of enumerate so that RESULT lines