Page MenuHomePhorge
Files F117747051

No OneTemporary
Actions

Authored By
Unknown
Size
3 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/pykolab/logger.py b/pykolab/logger.py
index c8fb9ef..64cdc8d 100644
--- a/pykolab/logger.py
+++ b/pykolab/logger.py
@@ -1,88 +1,93 @@
# -*- coding: utf-8 -*-
# Copyright 2010-2011 Kolab Systems AG (http://www.kolabsys.com)
#
# Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 3 or, at your option, any later version
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Library General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
import inspect
import logging
import logging.handlers
import sys
import time
from pykolab.translate import _
class Logger(logging.Logger):
debuglevel = 0
loglevel = logging.CRITICAL
for arg in sys.argv:
if debuglevel == -1:
debuglevel = int(arg)
#print debuglevel
loglevel = logging.DEBUG
break
if '-d' == arg:
debuglevel = -1
continue
- #print inspect.stack()
- #print "debuglevel:", debuglevel
- #print "loglevel:", loglevel
+ if '-l' == arg:
+ loglevel = -1
+ continue
+ if loglevel == -1:
+ if hasattr(logging,arg.upper()):
+ loglevel = getattr(logging,arg.upper())
+ else:
+ loglevel = logging.DEBUG
def __init__(self, *args, **kw):
if kw.has_key('name'):
name = kw['name']
elif len(args) == 1:
name = args[0]
else:
name = 'pykolab'
logging.Logger.__init__(self, name)
plaintextformatter = logging.Formatter("%(asctime)s %(name)s %(levelname)s %(message)s")
self.console_stdout = logging.StreamHandler(sys.stdout)
self.console_stdout.setFormatter(plaintextformatter)
self.addHandler(self.console_stdout)
if kw.has_key('logfile'):
self.logfile = kw['logfile']
else:
return
try:
filelog_handler = logging.FileHandler(filename=self.logfile)
filelog_handler.setFormatter(plaintextformatter)
except IOError, e:
print >> sys.stderr, _("Cannot log to file %s: %s") % (self.logfile, e)
if not len(self.handlers) > 1:
try:
self.addHandler(filelog_handler)
except:
pass
def remove_stdout_handler(self):
self.removeHandler(self.console_stdout)
def debug(self, msg, level=1):
self.setLevel(self.loglevel)
if level <= self.debuglevel:
# TODO: Not the way it's supposed to work!
self.log(logging.DEBUG, msg)
logging.setLoggerClass(Logger)

File Metadata

Mime Type
text/x-diff
Expires
Apr 4 2026, 12:04 AM (4 w, 2 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
18821618
Default Alt Text
(3 KB)

Event Timeline