Muehlenhoff has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/373082 )
Change subject: Add changes suggested by volans in earlier review
......................................................................
Add changes suggested by volans in earlier review
Change-Id: I7e96cdba5be1d94f4d387267da3d10b1157d23c4
---
M server/debdeploy.py
1 file changed, 4 insertions(+), 10 deletions(-)
Approvals:
Muehlenhoff: Looks good to me, approved
jenkins-bot: Verified
Volans: Looks good to me, but someone else must approve
diff --git a/server/debdeploy.py b/server/debdeploy.py
index f5f36ba..ec01c00 100755
--- a/server/debdeploy.py
+++ b/server/debdeploy.py
@@ -72,7 +72,7 @@
cmd : The Command to be executed
'''
- with open('/dev/null', 'w') as discard_output:
+ with open(os.devnull, 'w') as discard_output:
oldstdout = sys.stdout
oldstderr = sys.stderr
sys.stdout = discard_output
@@ -81,14 +81,11 @@
worker = transport.Transport.new(cumin_config, logging)
hosts = query.Query(cumin_config).execute('A:all')
- worker.target = transports.Target(hosts, batch_size=100,
batch_sleep=None, logger=logging)
+ worker.target = transports.Target(hosts, batch_size=100,
logger=logging)
worker.commands = [cmd]
- worker.timeout = None
worker.handler = 'sync'
worker.success_threshold = 0.1
- worker.batch_size = 100
- worker.batch_sleep = None
exit_code = worker.execute()
sys.stdout = oldstdout
sys.stderr = oldstderr
@@ -156,10 +153,7 @@
verbose : If enabled, the full of hosts needing a restart is shown
(boolean)
'''
- cmd = '/usr/bin/debdeploy-restarts --json --libname '
- for lib in libnames:
- cmd += lib + " "
-
+ cmd = '/usr/bin/debdeploy-restarts --json --libname ' + ' '.join(libnames)
worker = run_cumin(cmd)
restarts_per_lib = {}
@@ -192,7 +186,7 @@
for node in worker._handler_instance.nodes.itervalues():
if node.state.is_failed:
unreachable_hosts.append(node.name)
- if len(unreachable_hosts) > 0:
+ if unreachable_hosts:
print "The following hosts were unreachable:"
for host in unreachable_hosts:
print host
--
To view, visit https://gerrit.wikimedia.org/r/373082
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7e96cdba5be1d94f4d387267da3d10b1157d23c4
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/debdeploy
Gerrit-Branch: master
Gerrit-Owner: Muehlenhoff <[email protected]>
Gerrit-Reviewer: Muehlenhoff <[email protected]>
Gerrit-Reviewer: Volans <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
