jenkins-bot has submitted this change and it was merged. Change subject: Adopt a cleaner, simpler naming scheme for scripts ......................................................................
Adopt a cleaner, simpler naming scheme for scripts This change introduces a cleaner and simpler naming scheme for EventLogging entry points. Each entry point is a role, and each role is condensed to a single noun which describes its activity. This change also drops 'eventlogging-udp-seqid-mon'. Change-Id: I89921dfd5c22f70847641747ebc96e208d19f4f0 --- R server/bin/eventlogging-forwarder R server/bin/eventlogging-multiplexer R server/bin/eventlogging-processor D server/bin/eventlogging-udp-seqid-mon M server/setup.py 5 files changed, 3 insertions(+), 93 deletions(-) Approvals: Ori.livneh: Looks good to me, approved jenkins-bot: Verified diff --git a/server/bin/eventlogging-udp-zmq-forwarder b/server/bin/eventlogging-forwarder similarity index 100% rename from server/bin/eventlogging-udp-zmq-forwarder rename to server/bin/eventlogging-forwarder diff --git a/server/bin/eventlogging-zmq-mux b/server/bin/eventlogging-multiplexer similarity index 100% rename from server/bin/eventlogging-zmq-mux rename to server/bin/eventlogging-multiplexer diff --git a/server/bin/eventlogging-stream-processor b/server/bin/eventlogging-processor similarity index 100% rename from server/bin/eventlogging-stream-processor rename to server/bin/eventlogging-processor diff --git a/server/bin/eventlogging-udp-seqid-mon b/server/bin/eventlogging-udp-seqid-mon deleted file mode 100755 index 79b3d29..0000000 --- a/server/bin/eventlogging-udp-seqid-mon +++ /dev/null @@ -1,89 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -""" - eventlogging-udp-seqid-mon - -------------------------- - Monitor sequence IDs on a stream of varnishncsa udp output for gaps. - - usage: eventlogging-udp-seqid-mon [options] stream destfile - - positional arguments: - stream log file or stream URI - destfile write log to this file - - optional arguments: - -h, --help show this help message and exit - --sid SID set socket identity - --sep SEP field seperator (default: whitespace) - --hpos HPOS position of host field (0-indexed; default: 1) - --spos SPOS position of seq id field (0-indexed; default: 2) - - :copyright: (c) 2012 by Ori Livneh <[email protected]> - :license: GNU General Public Licence 2.0 or later - -""" -from __future__ import unicode_literals - -import argparse -import collections -import logging -import logging.handlers - -from eventlogging import zmq_subscribe - - -# -# Parse command-line args -# - -parser = argparse.ArgumentParser(description='Monitor udp2log sequence IDs.', - fromfile_prefix_chars='@') -parser.add_argument('input', help='URI of input stream') -parser.add_argument('destfile', help='write log to this file') -parser.add_argument('--sid', help='set socket identity') -parser.add_argument('--sep', help='field seperator (default: whitespace)') -parser.add_argument('--hpos', type=int, default=1, - help='position of host field (0-indexed; default: 1)') -parser.add_argument('--spos', type=int, default=2, - help='position of seq id field (0-indexed; default: 2)') -args = parser.parse_args() - - -# Configure logging to file: -formatter = logging.Formatter('%(asctime)s\t%(message)s') - -logfile_handler = logging.handlers.WatchedFileHandler( - filename=args.destfile, encoding='utf8') -logfile_handler.setFormatter(formatter) -logfile_handler.setLevel(logging.INFO) - -# Configure logging to stderr: -console_handler = logging.StreamHandler() -console_handler.setFormatter(formatter) -console_handler.setLevel(logging.DEBUG) # Don't pollute log files with status - -log = logging.getLogger(__name__) -log.setLevel(logging.DEBUG) -log.addHandler(logfile_handler) -log.addHandler(console_handler) -log.debug('Started. Logging to %s.' % args.destfile) - -lost = collections.defaultdict(int) -seqs = {} - -for line in zmq_subscribe(args.input, sid=args.sid): - try: - fields = line.split(args.sep) - host = fields[args.hpos] - seq = int(fields[args.spos]) - except (ValueError, IndexError): - log.exception('Unable to parse log line: %s', line) - continue - - last = seqs.get(host) - seqs[host] = seq - - if last is not None and last < (seq - 1): - skipped = seq - last - 1 - log.error('%s: %d -> %d (skipped: %d)', host, last, seq, skipped) - lost[host] += skipped diff --git a/server/setup.py b/server/setup.py index 7dd2dc2..7cfe5c3 100644 --- a/server/setup.py +++ b/server/setup.py @@ -43,12 +43,11 @@ 'eventlogging', ), scripts=( + 'bin/eventlogging-forwarder', + 'bin/eventlogging-multiplexer', 'bin/eventlogging-consumer', 'bin/eventlogging-devserver', - 'bin/eventlogging-stream-processor', - 'bin/eventlogging-udp-seqid-mon', - 'bin/eventlogging-udp-zmq-forwarder', - 'bin/eventlogging-zmq-mux', + 'bin/eventlogging-processor', ), zip_safe=False, test_suite='tests', -- To view, visit https://gerrit.wikimedia.org/r/71268 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I89921dfd5c22f70847641747ebc96e208d19f4f0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/EventLogging Gerrit-Branch: master Gerrit-Owner: Ori.livneh <[email protected]> Gerrit-Reviewer: Ori.livneh <[email protected]> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
