From 4b157344c9098f8d4b3fed162d30b7c724a6f969 Mon Sep 17 00:00:00 2001
From: Nick Ma <nick.mayerhofer@hotmail.com>
Date: Tue, 23 Jul 2013 17:41:08 +0200
Subject: [PATCH 1/2] logger: added facility name while in debug mode

---
 newsmangler/postmangler.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/newsmangler/postmangler.py b/newsmangler/postmangler.py
index 6bc4383..4d520a2 100644
--- a/newsmangler/postmangler.py
+++ b/newsmangler/postmangler.py
@@ -59,13 +59,18 @@ def __init__(self, conf, debug=False):
         # Create our logger
         self.logger = logging.getLogger('mangler')
         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)-10s %(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.

From cdee25bfe272998d47b65598ee5f84e8ace8f407 Mon Sep 17 00:00:00 2001
From: Nick Ma <nick.mayerhofer@hotmail.com>
Date: Wed, 24 Jul 2013 09:10:32 +0200
Subject: [PATCH 2/2] logger: changed facility names of the submodules (which
 are using the logger)

Conflicts:
	newsmangler/filewrap.py
---
 newsmangler/asyncnntp.py   | 2 +-
 newsmangler/filewrap.py    | 6 +++++-
 newsmangler/postmangler.py | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

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 4d520a2..cf6580e 100644
--- a/newsmangler/postmangler.py
+++ b/newsmangler/postmangler.py
@@ -57,13 +57,13 @@ def __init__(self, conf, debug=False):
         self._idle = []
         
         # Create our logger
-        self.logger = logging.getLogger('mangler')
+        self.logger = logging.getLogger('postMangler')
         handler = logging.StreamHandler()
         
         formatStr = ''
         if debug:
             self.logger.setLevel(logging.DEBUG)
-            formatStr = '%(asctime)s [%(levelname)-5s] %(name)-10s %(message)s'
+            formatStr = '%(asctime)s [%(levelname)-5s] %(name)-11s %(message)s'
         else:
             self.logger.setLevel(logging.INFO)
             formatStr = '%(asctime)s [%(levelname)-5s] %(message)s'