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

Removed log.verbose. I never liked it anyway.

Browse Source
This commit is contained in:
Jeremy Fincher 2005-02-04 05:59:07 +00:00
parent 6580fc535f
commit 65f713df4b
4 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/Services/plugin.py
View File

@ -135,8 +135,6 @@ class Services(callbacks.Privmsg):
disabled = self.registryValue('disabledNetworks') disabled = self.registryValue('disabledNetworks')
if irc.network in disabled or \ if irc.network in disabled or \
irc.state.supported.get('NETWORK', '') in disabled: irc.state.supported.get('NETWORK', '') in disabled:
self.log.verbose('Ignoring message from %s, %s is disabled.',
irc, irc.network)
return return
self.__parent.__call__(irc, msg) self.__parent.__call__(irc, msg)
nick = self._getNick() nick = self._getNick()

2
scripts/supybot-test
View File

@ -48,7 +48,7 @@ supybot.directories.conf: test-conf
supybot.directories.log: test-logs supybot.directories.log: test-logs
supybot.reply.whenNotCommand: True supybot.reply.whenNotCommand: True
supybot.log.stdout: False supybot.log.stdout: False
supybot.log.level: VERBOSE supybot.log.level: DEBUG
supybot.log.format: %(levelname)s %(message)s supybot.log.format: %(levelname)s %(message)s
supybot.log.plugins.individualLogfiles: False supybot.log.plugins.individualLogfiles: False
supybot.protocols.irc.throttleTime: 0 supybot.protocols.irc.throttleTime: 0

4
src/callbacks.py
View File

@ -546,7 +546,6 @@ _repr = repr
class IrcObjectProxy(RichReplyMethods): class IrcObjectProxy(RichReplyMethods):
"A proxy object to allow proper nested of commands (even threaded ones)." "A proxy object to allow proper nested of commands (even threaded ones)."
def __init__(self, irc, msg, args, nested=0): def __init__(self, irc, msg, args, nested=0):
log.verbose('IrcObjectProxy.__init__: %s' % args)
assert isinstance(args, list), 'Args should be a list, not a string.' assert isinstance(args, list), 'Args should be a list, not a string.'
self.irc = irc self.irc = irc
self.msg = msg self.msg = msg
@ -603,13 +602,10 @@ class IrcObjectProxy(RichReplyMethods):
self.finalEval() self.finalEval()
def _callTokenizedCommands(self): def _callTokenizedCommands(self):
log.verbose('Calling tokenizedCommands.')
for cb in self.irc.callbacks: for cb in self.irc.callbacks:
if hasattr(cb, 'tokenizedCommand'): if hasattr(cb, 'tokenizedCommand'):
log.verbose('Trying to call %s.tokenizedCommand.', cb.name())
self._callTokenizedCommand(cb) self._callTokenizedCommand(cb)
if self.msg.repliedTo: if self.msg.repliedTo:
log.verbose('Done calling tokenizedCommands: %s.',cb.name())
return return
def _callTokenizedCommand(self, cb): def _callTokenizedCommand(self, cb):

11
src/log.py
View File

@ -52,9 +52,6 @@ deadlyExceptions = [KeyboardInterrupt, SystemExit]
### ###
testing = False testing = False
VERBOSE = 1
logging.addLevelName(VERBOSE, 'VERBOSE')
class Formatter(logging.Formatter): class Formatter(logging.Formatter):
_fmtConf = staticmethod(lambda : conf.supybot.log.format()) _fmtConf = staticmethod(lambda : conf.supybot.log.format())
def formatTime(self, record, datefmt=None): def formatTime(self, record, datefmt=None):
@ -87,9 +84,6 @@ class Logger(logging.Logger):
# The traceback should be sufficient if we want it. # The traceback should be sufficient if we want it.
# self.error('Exception string: %s', eStrId) # self.error('Exception string: %s', eStrId)
def verbose(self, *args, **kwargs):
self.log(VERBOSE, *args, **kwargs)
def _log(self, level, msg, args, exc_info=None): def _log(self, level, msg, args, exc_info=None):
msg = format(msg, *args) msg = format(msg, *args)
logging.Logger._log(self, level, msg, (), exc_info=exc_info) logging.Logger._log(self, level, msg, (), exc_info=exc_info)
@ -208,7 +202,7 @@ class ValidLogLevel(registry.String):
return level return level
class LogLevel(ValidLogLevel): class LogLevel(ValidLogLevel):
"""Invalid log level. Value must be either VERBOSE, DEBUG, INFO, WARNING, """Invalid log level. Value must be either DEBUG, INFO, WARNING,
ERROR, or CRITICAL.""" ERROR, or CRITICAL."""
def setValue(self, v): def setValue(self, v):
ValidLogLevel.setValue(self, v) ValidLogLevel.setValue(self, v)
@ -226,7 +220,7 @@ conf.registerGlobalValue(conf.supybot.log, 'format',
its logging module.""")) its logging module."""))
conf.registerGlobalValue(conf.supybot.log, 'level', conf.registerGlobalValue(conf.supybot.log, 'level',
LogLevel(logging.INFO, """Determines what the minimum priority level logged LogLevel(logging.INFO, """Determines what the minimum priority level logged
will be. Valid values are VERBOSE, DEBUG, INFO, WARNING, ERROR, will be. Valid values are DEBUG, INFO, WARNING, ERROR,
and CRITICAL, in order of increasing priority.""")) and CRITICAL, in order of increasing priority."""))
conf.registerGlobalValue(conf.supybot.log, 'statistics', conf.registerGlobalValue(conf.supybot.log, 'statistics',
ValidLogLevel(-1, """Determines what level statistics reporting ValidLogLevel(-1, """Determines what level statistics reporting
@ -274,7 +268,6 @@ conf.registerGlobalValue(conf.supybot.log.plugins, 'format',
# These just make things easier. # These just make things easier.
debug = _logger.debug debug = _logger.debug
verbose = _logger.verbose
info = _logger.info info = _logger.info
warning = _logger.warning warning = _logger.warning
error = _logger.error error = _logger.error