Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-11-27 05:09:23 +01:00
Code Issues Projects Releases Wiki Activity

Fixed to re-raise errors appropriately.

Browse Source
This commit is contained in:
Jeremy Fincher 2003-12-03 22:32:33 +00:00
parent bb154e0a7f
commit 05ab09b9f5
1 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/log.py
View File

@ -36,6 +36,7 @@ import fix
import os import os
import sys import sys
import cgitb import cgitb
import types
import atexit import atexit
import logging import logging
@ -65,17 +66,43 @@ class Formatter(logging.Formatter):
return cgitb.text((E, e, tb)).rstrip('\r\n') return cgitb.text((E, e, tb)).rstrip('\r\n')
class DailyRotatingHandler(logging.FileHandler): 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\n" % msg)
else:
try:
self.stream.write("%s\n" % msg)
except UnicodeError:
self.stream.write("%s\n" % msg.encode("UTF-8"))
self.flush()
class BetterFileHandler(logging.FileHandler):
def emit(self, record):
msg = self.format(record)
if not hasattr(types, "UnicodeType"): #if no unicode support...
self.stream.write("%s\n" % msg)
else:
try:
self.stream.write("%s\n" % msg)
except UnicodeError:
self.stream.write("%s\n" % msg.encode("UTF-8"))
self.flush()
class DailyRotatingHandler(BetterFileHandler):
def __init__(self, *args): def __init__(self, *args):
self.lastRollover = time.localtime() self.lastRollover = time.localtime()
logging.FileHandler.__init__(self, *args) BetterFileHandler.__init__(self, *args)
def emit(self, record): def emit(self, record):
now = time.localtime() now = time.localtime()
if now[2] != self.lastRollover[2]: if now[2] != self.lastRollover[2]:
self.doRollover() self.doRollover()
self.lastRollover = now self.lastRollover = now
logging.FileHandler.emit(self, record) BetterFileHandler.emit(self, record)
def doRollover(self): def doRollover(self):
self.stream.close() self.stream.close()
@ -118,14 +145,14 @@ pluginFormatter = Formatter('%(levelname)s %(asctime)s %(name)s %(message)s')
# These are not. # These are not.
_logger = logging.getLogger('supybot') _logger = logging.getLogger('supybot')
_handler = logging.FileHandler(os.path.join(conf.logDir, 'misc.log')) _handler = BetterFileHandler(os.path.join(conf.logDir, 'misc.log'))
_handler.setFormatter(formatter) _handler.setFormatter(formatter)
_handler.setLevel(conf.minimumLogPriority) _handler.setLevel(conf.minimumLogPriority)
_logger.addHandler(_handler) _logger.addHandler(_handler)
_logger.setLevel(-1) _logger.setLevel(-1)
if conf.stdoutLogging: if conf.stdoutLogging:
_stdoutHandler = logging.StreamHandler(sys.stdout) _stdoutHandler = BetterStreamHandler(sys.stdout)
_formatString = '%(name)s: %(levelname)s %(asctime)s %(message)s' _formatString = '%(name)s: %(levelname)s %(asctime)s %(message)s'
_stdoutFormatter = ColorizedFormatter(_formatString) _stdoutFormatter = ColorizedFormatter(_formatString)
_stdoutHandler.setFormatter(_stdoutFormatter) _stdoutHandler.setFormatter(_stdoutFormatter)
@ -155,7 +182,7 @@ def getPluginLogger(name):
log = logging.getLogger('supybot.plugins.%s' % name) log = logging.getLogger('supybot.plugins.%s' % name)
if not log.handlers: if not log.handlers:
filename = os.path.join(pluginLogDir, '%s.log' % name) filename = os.path.join(pluginLogDir, '%s.log' % name)
handler = logging.FileHandler(filename) handler = BetterFileHandler(filename)
handler.setLevel(conf.minimumLogPriority) handler.setLevel(conf.minimumLogPriority)
handler.setFormatter(pluginFormatter) handler.setFormatter(pluginFormatter)
log.addHandler(handler) log.addHandler(handler)