Update of /cvsroot/pywebmail/webmail/webmail/utils/xlogging
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31664
Modified Files:
__init__.py
Log Message:
earlier logging
Index: __init__.py
===================================================================
RCS file: /cvsroot/pywebmail/webmail/webmail/utils/xlogging/__init__.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** __init__.py 10 Oct 2004 02:35:08 -0000 1.1
--- __init__.py 2 Mar 2008 16:02:18 -0000 1.2
***************
*** 3,6 ****
--- 3,7 ----
#must have at least 3 items
verbose_map = [logging.ERROR,logging.WARN,logging.INFO,logging.DEBUG,logging.NOTSET]
+ max_verbose = len(verbose_map)-1
BASIC_FORMAT = "%(asctime)s:%(levelname)s:%(name)s:%(message)s"
***************
*** 27,31 ****
--- 28,34 ----
if line: self.func(line)
+ default_handler_installed = 0
def appConfig(app=None, verbose=1):
+ global default_handler_installed
if not app:
app = sys.argv[0]
***************
*** 39,47 ****
if os.path.exists(logconfig):
logging.fileConfig(logconfig)
! else:
hdlr = logging.StreamHandler()
fmt = logging.Formatter(BASIC_FORMAT)
hdlr.setFormatter(fmt)
logging.getLogger('').addHandler(hdlr)
if verbose is not None:
logConfig(verbose=verbose)
--- 42,51 ----
if os.path.exists(logconfig):
logging.fileConfig(logconfig)
! elif not default_handler_installed:
hdlr = logging.StreamHandler()
fmt = logging.Formatter(BASIC_FORMAT)
hdlr.setFormatter(fmt)
logging.getLogger('').addHandler(hdlr)
+ default_handler_installed = 1
if verbose is not None:
logConfig(verbose=verbose)
***************
*** 49,53 ****
# None is root logger
def logConfig(log=None, verbose=1):
! verbose = min(max(verbose,0),len(verbose_map)-1)
if log is None or type(log)==type(''):
log = logging.getLogger(log)
--- 53,57 ----
# None is root logger
def logConfig(log=None, verbose=1):
! verbose = min(max(verbose,0),max_verbose)
if log is None or type(log)==type(''):
log = logging.getLogger(log)
|
