jenkins-bot has submitted this change and it was merged.
Change subject: Harmonize logging setup
......................................................................
Harmonize logging setup
Each of the scripts set up logging on their own. And it seems the
setups differed not due to some special need, but because it's hard to
keep them in sync. Also, it was especially cumbersome that
eventlogging-consumer does not add a timestamp. This made
reconstructing issues from only the logs unnecessarily hard. Hence, we
now setup up the scripts' logging in a central place. That's easier to
maintain, and buys us timestamps in eventlogging-consumer instances
for free.
Change-Id: I600a6dfbcdf65c70789f35e59b7b65039625aeda
---
M server/bin/eventlogging-consumer
M server/bin/eventlogging-forwarder
M server/bin/eventlogging-multiplexer
M server/bin/eventlogging-processor
M server/bin/eventlogging-reporter
M server/eventlogging/utils.py
6 files changed, 20 insertions(+), 12 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/server/bin/eventlogging-consumer b/server/bin/eventlogging-consumer
index 3476264..c0b8f50 100755
--- a/server/bin/eventlogging-consumer
+++ b/server/bin/eventlogging-consumer
@@ -32,9 +32,7 @@
import eventlogging
-log = logging.getLogger('EventLogging')
-log.setLevel(logging.DEBUG)
-log.addHandler(logging.StreamHandler(sys.stderr))
+eventlogging.setup_logging()
ap = argparse.ArgumentParser(description='EventLogger',
fromfile_prefix_chars='@')
@@ -48,5 +46,5 @@
if args.load_plugins:
eventlogging.load_plugins()
-log.info('Driving %s -> %s..', args.input, args.output)
+logging.info('Driving %s -> %s..', args.input, args.output)
eventlogging.drive(args.input, args.output)
diff --git a/server/bin/eventlogging-forwarder
b/server/bin/eventlogging-forwarder
index 4299739..e478714 100755
--- a/server/bin/eventlogging-forwarder
+++ b/server/bin/eventlogging-forwarder
@@ -31,7 +31,7 @@
import argparse
import logging
-from eventlogging import iter_unicode, pub_socket, udp_socket
+from eventlogging import iter_unicode, pub_socket, udp_socket, setup_logging
ap = argparse.ArgumentParser(description='ZeroMQ UDP => PUB Device',
@@ -41,8 +41,7 @@
help='Prepend an autoincrementing ID to each message')
args = ap.parse_args()
-logging.basicConfig(stream=sys.stderr, level=logging.DEBUG,
- format='%(asctime)s %(message)s')
+setup_logging()
logging.info('Forwarding udp:%d => tcp:%d...', args.port, args.port)
sock_out = pub_socket(args.port)
diff --git a/server/bin/eventlogging-multiplexer
b/server/bin/eventlogging-multiplexer
index 67c3a21..f0d225d 100755
--- a/server/bin/eventlogging-multiplexer
+++ b/server/bin/eventlogging-multiplexer
@@ -33,10 +33,10 @@
import zmq
-from eventlogging import pub_socket, sub_socket
+from eventlogging import pub_socket, sub_socket, setup_logging
-logging.basicConfig(level=logging.DEBUG, stream=sys.stderr)
+setup_logging()
ap = argparse.ArgumentParser(description='Multiplex ZMQ_PUB sockets',
fromfile_prefix_chars='@')
diff --git a/server/bin/eventlogging-processor
b/server/bin/eventlogging-processor
index fce92d1..7b07e2a 100755
--- a/server/bin/eventlogging-processor
+++ b/server/bin/eventlogging-processor
@@ -38,10 +38,10 @@
import logging
from eventlogging import (capsule_uuid, iter_unicode, json, LogParser,
- pub_socket, sub_socket, validate)
+ pub_socket, sub_socket, validate, setup_logging)
-logging.basicConfig(level=logging.DEBUG, stream=sys.stderr)
+setup_logging()
ap = argparse.ArgumentParser(description='Raw log -> JSON stream',
fromfile_prefix_chars='@')
diff --git a/server/bin/eventlogging-reporter b/server/bin/eventlogging-reporter
index fb7bcda..37e69a1 100755
--- a/server/bin/eventlogging-reporter
+++ b/server/bin/eventlogging-reporter
@@ -30,6 +30,10 @@
import zmq
+from eventlogging import setup_logging
+
+
+setup_logging()
ap = argparse.ArgumentParser(description='eventlogging-reporter',
fromfile_prefix_chars='@')
diff --git a/server/eventlogging/utils.py b/server/eventlogging/utils.py
index 8c441ad..35aef5d 100644
--- a/server/eventlogging/utils.py
+++ b/server/eventlogging/utils.py
@@ -9,13 +9,15 @@
"""
from __future__ import unicode_literals
+import sys
import re
import threading
+import logging
from .compat import monotonic_clock
-__all__ = ('PeriodicThread', 'uri_delete_query_item')
+__all__ = ('PeriodicThread', 'uri_delete_query_item', 'setup_logging')
class PeriodicThread(threading.Thread):
@@ -59,3 +61,8 @@
separator, trailing_ampersand = match.groups()
return separator if trailing_ampersand else ''
return re.sub('([?&])%s=[^&]*(&?)' % re.escape(key), repl, uri)
+
+
+def setup_logging():
+ logging.basicConfig(stream=sys.stderr, level=logging.DEBUG,
+ format='%(asctime)s %(message)s')
--
To view, visit https://gerrit.wikimedia.org/r/176027
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I600a6dfbcdf65c70789f35e59b7b65039625aeda
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/EventLogging
Gerrit-Branch: master
Gerrit-Owner: QChris <christ...@quelltextlich.at>
Gerrit-Reviewer: Nuria <nu...@wikimedia.org>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: QChris <christ...@quelltextlich.at>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
