summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbwarsaw2001-06-02 05:18:07 +0000
committerbwarsaw2001-06-02 05:18:07 +0000
commit2641b2f18fd608367a70a4b4da15f986a85354bf (patch)
tree043dd9d1ce806e91b8fe08eb73596ccb95f167cd
parent105ac239592d13ff81b02b308250c4200d4c894a (diff)
downloadmailman-2641b2f18fd608367a70a4b4da15f986a85354bf.tar.gz
mailman-2641b2f18fd608367a70a4b4da15f986a85354bf.tar.zst
mailman-2641b2f18fd608367a70a4b4da15f986a85354bf.zip
-rw-r--r--Mailman/Logging/Logger.py53
1 files changed, 27 insertions, 26 deletions
diff --git a/Mailman/Logging/Logger.py b/Mailman/Logging/Logger.py
index 660b19bb9..7627720da 100644
--- a/Mailman/Logging/Logger.py
+++ b/Mailman/Logging/Logger.py
@@ -23,18 +23,19 @@ from Mailman import mm_cfg
from Mailman.Logging.Utils import _logexc
+
class Logger:
def __init__(self, category, nofail=1, immediate=0):
- """Nofail says to fallback to sys.__stderr__ if write fails to
+ """nofail says to fallback to sys.__stderr__ if write fails to
category file - a complaint message is emitted, but no exception is
raised. Set nofail=0 if you want to handle the error in your code,
instead.
immediate=1 says to create the log file on instantiation.
- Otherwise, the file is created only when there are writes pending."""
-
+ Otherwise, the file is created only when there are writes pending.
+ """
self.__filename = os.path.join(mm_cfg.LOG_DIR, category)
- self.__fp = None
+ self.__fp = None
self.__nofail = nofail
if immediate:
self.__get_f()
@@ -46,16 +47,16 @@ class Logger:
return '<%s to %s>' % (self.__class__.__name__, `self.__filename`)
def __get_f(self):
- if self.__fp:
- return self.__fp
- else:
- try:
- ou = os.umask(002)
- try:
- f = self.__fp = open(self.__filename, 'a+', 1)
- finally:
- os.umask(ou)
- except IOError, e:
+ if self.__fp:
+ return self.__fp
+ else:
+ try:
+ ou = os.umask(002)
+ try:
+ f = self.__fp = open(self.__filename, 'a+', 1)
+ finally:
+ os.umask(ou)
+ except IOError, e:
if self.__nofail:
_logexc(self, e)
f = self.__fp = sys.__stderr__
@@ -64,23 +65,23 @@ class Logger:
return f
def flush(self):
- f = self.__get_f()
- if hasattr(f, 'flush'):
- f.flush()
+ f = self.__get_f()
+ if hasattr(f, 'flush'):
+ f.flush()
def write(self, msg):
- f = self.__get_f()
- try:
- f.write(msg)
- except IOError, msg:
+ f = self.__get_f()
+ try:
+ f.write(msg)
+ except IOError, msg:
_logexc(self, msg)
def writelines(self, lines):
- for l in lines:
- self.write(l)
+ for l in lines:
+ self.write(l)
def close(self):
- if not self.__fp:
- return
- self.__get_f().close()
+ if not self.__fp:
+ return
+ self.__get_f().close()
self.__fp = None