Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2025-02-18 22:51:01 +01:00
Code Issues Projects Releases Wiki Activity

Reverted to 1.25.

Browse Source
This commit is contained in:
Jeremy Fincher 2004-04-13 00:59:19 +00:00
parent cb97f75027
commit 2e2e90b910
1 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/log.py
View File

@ -43,7 +43,6 @@ import logging
import ansi import ansi
import conf import conf
import utils import utils
import ircutils
import registry import registry
deadlyExceptions = [KeyboardInterrupt, SystemExit] deadlyExceptions = [KeyboardInterrupt, SystemExit]
@ -131,7 +130,6 @@ class ColorizedFormatter(Formatter):
else: else:
return Formatter.format(self, record, *args, **kwargs) return Formatter.format(self, record, *args, **kwargs)
# These are public. # These are public.
formatter = Formatter('%(levelname)s %(asctime)s %(message)s') formatter = Formatter('%(levelname)s %(asctime)s %(message)s')
pluginFormatter = Formatter('%(levelname)s %(asctime)s %(name)s %(message)s') pluginFormatter = Formatter('%(levelname)s %(asctime)s %(name)s %(message)s')
@ -219,16 +217,11 @@ class MetaFirewall(type):
class LogLevel(registry.Value): class LogLevel(registry.Value):
def __init__(self, target, default, help,
private=False, showDefault=True, **kwargs):
registry.Value.__init__(self, default, help, private=private,
showDefault=showDefault, **kwargs)
self._target = target
def set(self, s): def set(self, s):
s = s.upper() s = s.upper()
try: try:
self.value = getattr(logging, s) self.value = getattr(logging, s)
self._target.setLevel(self.value) # _logger defined later. _logger.setLevel(self.value) # _logger defined later.
except AttributeError: except AttributeError:
s = 'Invalid log level: should be one of ' \ s = 'Invalid log level: should be one of ' \
'DEBUG, INFO, WARNING, ERROR, or CRITICAL.' 'DEBUG, INFO, WARNING, ERROR, or CRITICAL.'
@ -240,10 +233,10 @@ conf.supybot.directories.register('log', registry.String('logs', """Determines
what directory the bot will store its logfiles in.""")) what directory the bot will store its logfiles in."""))
conf.supybot.register('log') conf.supybot.register('log')
conf.supybot.log.register('level', LogLevel(_logger, logging.INFO, conf.supybot.log.register('level', LogLevel(logging.INFO,
"""Determines what the minimum priority level logged will be to log files. """Determines what the minimum priority level logged will be. Valid values are
Valid values are DEBUG, INFO, WARNING, ERROR, and CRITICAL, in order of DEBUG, INFO, WARNING, ERROR, and CRITICAL, in order of increasing
increasing priority.""")) priority."""))
conf.supybot.log.register('stdout', conf.supybot.log.register('stdout',
registry.Boolean(True, """Determines whether the bot will log to registry.Boolean(True, """Determines whether the bot will log to
stdout.""")) stdout."""))
@ -270,13 +263,12 @@ pluginLogDir = os.path.join(conf.supybot.directories.log(), 'plugins')
if not os.path.exists(pluginLogDir): if not os.path.exists(pluginLogDir):
os.mkdir(pluginLogDir, 0755) os.mkdir(pluginLogDir, 0755)
_logger.setLevel(-1)
_handler = BetterFileHandler(os.path.join(conf.supybot.directories.log(), _handler = BetterFileHandler(os.path.join(conf.supybot.directories.log(),
'misc.log')) 'misc.log'))
_handler.setFormatter(formatter) _handler.setFormatter(formatter)
_handler.setLevel(conf.supybot.log.level()) _handler.setLevel(-1)
_logger.addHandler(_handler) _logger.addHandler(_handler)
_logger.setLevel(conf.supybot.log.level())
_stdoutHandler = StdoutStreamHandler(sys.stdout) _stdoutHandler = StdoutStreamHandler(sys.stdout)
_formatString = '%(name)s: %(levelname)s %(message)s' _formatString = '%(name)s: %(levelname)s %(message)s'
@ -285,9 +277,6 @@ _stdoutHandler.setFormatter(_stdoutFormatter)
_stdoutHandler.setLevel(-1) _stdoutHandler.setLevel(-1)
_logger.addHandler(_stdoutHandler) _logger.addHandler(_stdoutHandler)
conf.supybot.log.stdout.register('level', LogLevel(_stdoutHandler,
logging.DEBUG, """Determines what the minimum priority level logged will be to
stdout. See supybot.log.level for possible values"""))
# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78: # vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78: