# HG changeset patch # User Tero Marttila # Date 1265398206 -7200 # Node ID 395182b7ea0fd31d1ae2df15871940f917e4f37a # Parent 21ab25ffa1e88c9f0ed5e0a87af2a9f1909d5bde logPrefix magic for LogSource, cleanup handleMessage diff -r 21ab25ffa1e8 -r 395182b7ea0f fixbot/logwatch/sources.py --- a/fixbot/logwatch/sources.py Fri Feb 05 21:16:19 2010 +0200 +++ b/fixbot/logwatch/sources.py Fri Feb 05 21:30:06 2010 +0200 @@ -68,15 +68,14 @@ else : # handle the structured message - self.handleMessage(msg) + log.callWithLogger(self, self.handleMessage, msg) def handleMessage (self, msg) : """ Process the given SyslogMessage """ - - # XXX: filters should accept messages... - line = str(msg) + + # Log incoming lines log.msg(repr(msg)) for filter in self.filters : @@ -179,3 +178,6 @@ # handle it as a line of data self.handleLine(data) + def logPrefix (self) : + return "LogSource(%s)" % (self.name, ) +