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

Refactored LogLevel crap.

Browse Source
This commit is contained in:
Jeremy Fincher 2004-04-18 06:24:37 +00:00
parent 437afe707c
commit 086a2fcab6
2 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/LogToIrc.py
View File

@ -130,24 +130,12 @@ _formatString = '%(name)s: %(levelname)s %(message)s'
_ircFormatter = ColorizedIrcFormatter(_formatString) _ircFormatter = ColorizedIrcFormatter(_formatString)
_ircHandler.setFormatter(_ircFormatter) _ircHandler.setFormatter(_ircFormatter)
class IrcLogLevel(log.LogLevel): class IrcLogLevel(log.ValidLogLevel):
"""Value must be one of INFO, WARNING, ERROR, or CRITICAL.""" """Value must be one of INFO, WARNING, ERROR, or CRITICAL."""
def set(self, s): minimumLevel = logging.INFO
# FIXME: Overriding set() here because log.LogLevel.set() sets the
# default log level as well. log.LogLevel and this class should be
# refactored and use registry.OnlySomeStrings in the future.
s = s.upper()
try:
self.setValue(getattr(logging, s))
_ircHandler.setLevel(self.value)
except AttributeError:
self.error()
def setValue(self, v): def setValue(self, v):
if v <= logging.DEBUG: log.ValidLogLevel.setValue(self, v)
self.error() _ircHandler.setLevel(self.value)
else:
log.LogLevel.setValue(self, v)
class ValidChannelOrNick(registry.String): class ValidChannelOrNick(registry.String):
"""Value must be a valid channel or a valid nick.""" """Value must be a valid channel or a valid nick."""

19
src/log.py
View File

@ -220,20 +220,29 @@ class MetaFirewall(type):
return type.__new__(cls, name, bases, dict) return type.__new__(cls, name, bases, dict)
class LogLevel(registry.Value): class ValidLogLevel(registry.String):
"""Invalid log level. Value must be either DEBUG, INFO, WARNING, ERROR, """This should be overridden."""
or CRITICAL.""" minimumLevel = -1
def set(self, s): def set(self, s):
s = s.upper() s = s.upper()
try: try:
self.setValue(getattr(logging, s)) level = getattr(logging, s)
_logger.setLevel(self.value) # _logger defined later. if level < self.minimumLevel:
self.error()
self.setValue(level)
except AttributeError: except AttributeError:
self.error() self.error()
def __str__(self): def __str__(self):
return logging.getLevelName(self.value) return logging.getLevelName(self.value)
class LogLevel(ValidLogLevel):
"""Invalid log level. Value must be either DEBUG, INFO, WARNING, ERROR,
or CRITICAL."""
def setValue(self, v):
ValidLogLevel.setValue(self, v)
_logger.setLevel(self.value) # _logger defined later.
conf.supybot.directories.register('log', registry.String('logs', """Determines 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."""))