Muehlenhoff has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/373862 )
Change subject: Pass a logger instance to cumin
......................................................................
Pass a logger instance to cumin
Change-Id: I263956bb68dae2068b5afaff74e5f1607138f914
---
M server/debdeploy
1 file changed, 9 insertions(+), 10 deletions(-)
Approvals:
Muehlenhoff: Looks good to me, approved
jenkins-bot: Verified
diff --git a/server/debdeploy b/server/debdeploy
index 2ce56eb..63c77ae 100755
--- a/server/debdeploy
+++ b/server/debdeploy
@@ -33,14 +33,13 @@
cumin_config = cumin.Config()
conf = DebDeployConfig("/etc/debdeploy.conf")
+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:
- logging.basicConfig(filename='/var/log/debdeploy/debdeploy.log',
- format='%(levelname)s: %(asctime)s : %(funcName)s :
%(message)s',
- level=logging.DEBUG)
-else:
- logging.basicConfig(filename='/var/log/debdeploy/debdeploy.log',
- format='%(levelname)s: %(asctime)s : %(funcName)s :
%(message)s',
- level=logging.INFO)
+ logger.setLevel(logging.DEBUG)
class logpager:
@@ -90,9 +89,9 @@
sys.stdout = discard_output
sys.stderr = discard_output
- hosts = query.Query(cumin_config, logger=logging).execute('A:all')
- target = transports.Target(hosts, batch_size=100, logger=logging)
- worker = transport.Transport.new(cumin_config, target, logger=logging)
+ hosts = query.Query(cumin_config, logger=logger).execute('A:all')
+ target = transports.Target(hosts, batch_size=100, logger=logger)
+ worker = transport.Transport.new(cumin_config, target, logger=logger)
worker.commands = [cmd]
--
To view, visit https://gerrit.wikimedia.org/r/373862
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I263956bb68dae2068b5afaff74e5f1607138f914
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/debdeploy
Gerrit-Branch: master
Gerrit-Owner: Volans <[email protected]>
Gerrit-Reviewer: Muehlenhoff <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
