From 24e09136b6009f3bc32e85492b454c668cf12d93 Mon Sep 17 00:00:00 2001 From: Jeremy Fincher Date: Wed, 25 Aug 2004 04:06:07 +0000 Subject: [PATCH] Allow numeric levels as well, so statistcs can be -1 if necessary. --- src/log.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/log.py b/src/log.py index d032a887f..6a97e4a92 100644 --- a/src/log.py +++ b/src/log.py @@ -249,20 +249,25 @@ class MetaFirewall(type): class ValidLogLevel(registry.String): - """This should be overridden.""" + """Invalid log level.""" minimumLevel = -1 def set(self, s): s = s.upper() try: level = getattr(logging, s) - if level < self.minimumLevel: - self.error() - self.setValue(level) except AttributeError: + try: + level = int(s) + except ValueError: + self.error() + if level < self.minimumLevel: self.error() + self.setValue(level) def __str__(self): - return logging.getLevelName(self.value) + level = logging.getLevelName(self.value) + if level.startswith('Level'): + level = level.split()[-1] class LogLevel(ValidLogLevel): """Invalid log level. Value must be either DEBUG, INFO, WARNING, ERROR,