Volans has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/405690 )
Change subject: Refactor for Cumin 2.0.0 API ...................................................................... Refactor for Cumin 2.0.0 API Change-Id: I13ad0a08d790d85eb39b59853a206b72f9fe2414 --- M debian/changelog M server/debdeploy 2 files changed, 9 insertions(+), 8 deletions(-) Approvals: Muehlenhoff: Looks good to me, but someone else must approve jenkins-bot: Verified Volans: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index eeb3118..8997c7c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ * Remove a stray import of salt.client * Use readline in generate-debdeploy-spec * Let debdeploy-server depend on cumin + * Minor refactor for Cumin 2.0.0 -- Moritz Muehlenhoff <[email protected]> Tue, 26 Sep 2017 09:21:58 +0200 diff --git a/server/debdeploy b/server/debdeploy index 7baf1bd..fe467dc 100755 --- a/server/debdeploy +++ b/server/debdeploy @@ -31,13 +31,13 @@ cumin_config = cumin.Config() conf = DebDeployConfig("/etc/debdeploy.conf") +logging_level = logging.INFO +if conf.debug: + logging_level = logging.DEBUG + logging.basicConfig(filename='/var/log/debdeploy/debdeploy.log', format='%(levelname)s: %(asctime)s : %(funcName)s : %(message)s', - level=logging.INFO) - -logger = logging.getLogger('debdeploy') -if conf.debug: - logger.setLevel(logging.DEBUG) + level=logging_level) class logpager: @@ -89,9 +89,9 @@ sys.stdout = discard_output sys.stderr = discard_output - hosts = query.Query(cumin_config, logger=logger).execute('A:' + alias) - target = transports.Target(hosts, batch_size=100, logger=logger) - worker = transport.Transport.new(cumin_config, target, logger=logger) + hosts = query.Query(cumin_config).execute('A:' + alias) + target = transports.Target(hosts, batch_size=100) + worker = transport.Transport.new(cumin_config, target) worker.commands = [cmd] worker.handler = 'sync' -- To view, visit https://gerrit.wikimedia.org/r/405690 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I13ad0a08d790d85eb39b59853a206b72f9fe2414 Gerrit-PatchSet: 2 Gerrit-Project: operations/debs/debdeploy Gerrit-Branch: master Gerrit-Owner: Volans <[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
