diff --git a/newsmangler/asyncnntp.py b/newsmangler/asyncnntp.py index 9d04789..6af4e9a 100644 --- a/newsmangler/asyncnntp.py +++ b/newsmangler/asyncnntp.py @@ -59,7 +59,7 @@ class asyncNNTP(asyncore.dispatcher): def __init__(self, parent, connid, host, port, bindto, username, password): asyncore.dispatcher.__init__(self) - self.logger = logging.getLogger('mangler') + self.logger = logging.getLogger('asyncCores') self.parent = parent self.connid = connid diff --git a/newsmangler/filewrap.py b/newsmangler/filewrap.py index fcc5ccf..b54d312 100644 --- a/newsmangler/filewrap.py +++ b/newsmangler/filewrap.py @@ -36,7 +36,11 @@ def __init__(self, filepath, parts): self._file = None - self.logger = logging.getLogger('mangler') + self.logger = logging.getLogger('fileWrapper') + + def __del__(self): + self._closeFile() + def read_part(self, begin, end): self.logger.debug('%s read_part %d %d', self._filepath, begin, end) diff --git a/newsmangler/postmangler.py b/newsmangler/postmangler.py index 6bc4383..cf6580e 100644 --- a/newsmangler/postmangler.py +++ b/newsmangler/postmangler.py @@ -57,15 +57,20 @@ def __init__(self, conf, debug=False): self._idle = [] # Create our logger - self.logger = logging.getLogger('mangler') + self.logger = logging.getLogger('postMangler') handler = logging.StreamHandler() - formatter = logging.Formatter('%(asctime)s [%(levelname)s] %(message)s') - handler.setFormatter(formatter) - self.logger.addHandler(handler) + + formatStr = '' if debug: self.logger.setLevel(logging.DEBUG) + formatStr = '%(asctime)s [%(levelname)-5s] %(name)-11s %(message)s' else: self.logger.setLevel(logging.INFO) + formatStr = '%(asctime)s [%(levelname)-5s] %(message)s' + + formatter = logging.Formatter(formatStr) + handler.setFormatter(formatter) + self.logger.addHandler(handler) # Create a poll object for async bits to use. If the user doesn't have # poll, we're going to have to fake it.