Ori.livneh has submitted this change and it was merged.
Change subject: coal: using stdlib's logging
......................................................................
coal: using stdlib's logging
Using syslog.syslog() is fine, except exception info doesn't end up
there. We could use logging.handlers.sysLogHandler, but let's just log
to stderr and let systemd manage the output.
Change-Id: Iff9962998211edba9f94cf3662ccd18c685eeee6
---
M modules/coal/files/coal
1 file changed, 10 insertions(+), 4 deletions(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
diff --git a/modules/coal/files/coal b/modules/coal/files/coal
index 9863f12..25bb523 100755
--- a/modules/coal/files/coal
+++ b/modules/coal/files/coal
@@ -111,7 +111,7 @@
def __init__(self):
self.args = self.arg_parser.parse_args()
self.windows = collections.defaultdict(collections.deque)
- syslog.openlog('coal', syslog.LOG_PERROR, syslog.LOG_DAEMON)
+ self.log = logging.getLogger(__name__)
def get_whisper_file(self, metric):
return os.path.join(self.args.whisper_dir, metric + '.wsp')
@@ -126,7 +126,7 @@
def run(self):
self.create_whisper_files()
- syslog.syslog('Connecting to %s.' % self.args.endpoint)
+ self.log.info('Connecting to %s.', self.args.endpoint)
socket = zmq.Context().socket(zmq.SUB)
socket.connect(self.args.endpoint)
socket.subscribe = b''
@@ -139,7 +139,7 @@
poll.register(socket.fd, select.EPOLLIN)
poll.register(timer_fd, select.EPOLLIN)
- syslog.syslog('Entering main loop.')
+ self.log.info('Entering main loop.')
intervals_since_last_event = 0
@@ -160,6 +160,7 @@
self.handle_event(meta)
except IOError as e:
if e.errno != errno.EINTR:
+ self.log.exception('Error in main loop:')
raise
def handle_event(self, meta):
@@ -179,9 +180,14 @@
window.popleft()
current_value = median(value for timestamp, value in window)
whisper.update(self.get_whisper_file(metric), current_value)
- syslog.syslog('%s: %d' % (metric, current_value))
+ self.log.debug('%s: %d' % (metric, current_value))
if __name__ == '__main__':
+ logger = logging.getLogger(__name__)
+ logger.setLevel(logging.DEBUG)
+ stderr_handler = logging.StreamHandler(stream=sys.stderr)
+ logger.addHandler(stderr_handler)
+
app = WhisperLogger()
app.run()
--
To view, visit https://gerrit.wikimedia.org/r/317832
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iff9962998211edba9f94cf3662ccd18c685eeee6
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
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
