From 65c9ebc746dae9ebbc0862533fb25a942a165800 Mon Sep 17 00:00:00 2001 From: Jeremy Fincher Date: Tue, 11 May 2004 22:29:29 +0000 Subject: [PATCH] Updated slightly, let's see if this helps. --- src/log.py | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/src/log.py b/src/log.py index c1a438a35..be06a2128 100644 --- a/src/log.py +++ b/src/log.py @@ -71,20 +71,8 @@ class Logger(logging.Logger): self.error('Exception id: %s', eId) self.error('Exception string: %s', eStrId) -class BetterStreamHandler(logging.StreamHandler): - def emit(self, record): - msg = self.format(record) - if not hasattr(types, "UnicodeType"): #if no unicode support... - self.stream.write("%s%s" % (msg, os.linesep)) - else: - try: - self.stream.write("%s%s" % (msg, os.linesep)) - except UnicodeError: - self.stream.write("%s%s" % (msg.encode("UTF-8"), os.linesep)) - self.flush() - -class StdoutStreamHandler(BetterStreamHandler): +class StdoutStreamHandler(logging.StreamHandler): def disable(self): self.setLevel(sys.maxint) # Just in case. _logger.removeHandler(self) @@ -97,7 +85,7 @@ class StdoutStreamHandler(BetterStreamHandler): def emit(self, record): if conf.supybot.log.stdout() and not conf.daemonized: try: - BetterStreamHandler.emit(self, record) + logging.StreamHandler.emit(self, record) except ValueError, e: # Raised if sys.stdout is closed. self.disable() error('Error logging to stdout. Removing stdout handler.')