From a168ef93f53d746e880295241218b41f39bbcb3d Mon Sep 17 00:00:00 2001
From: Holger Brunn <hbrunn@therp.nl>
Date: Sat, 31 Jan 2015 14:13:35 +0100
Subject: [PATCH] [IMP] use a dedicated logger

---
 .../model/fetchmail_server.py                       | 13 +++++++------
 .../wizard/attach_mail_manually.py                  | 13 +++++++------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/fetchmail_attach_from_folder/model/fetchmail_server.py b/fetchmail_attach_from_folder/model/fetchmail_server.py
index 60dbdce94..c0f1a2107 100644
--- a/fetchmail_attach_from_folder/model/fetchmail_server.py
+++ b/fetchmail_attach_from_folder/model/fetchmail_server.py
@@ -26,6 +26,7 @@ from lxml import etree
 from openerp import models, fields, api, exceptions
 from openerp.tools.translate import _
 from openerp.tools.misc import UnquoteEvalContext
+_logger = logging.getLogger(__name__)
 
 
 class fetchmail_server(models.Model):
@@ -80,21 +81,21 @@ class fetchmail_server(models.Model):
         matched_object_ids = []
 
         for this in self:
-            logging.info(
+            _logger.info(
                 'start checking for emails in %s server %s',
                 folder.path, this.name)
 
             match_algorithm = folder.get_algorithm()
 
             if connection.select(folder.path)[0] != 'OK':
-                logging.error(
+                _logger.error(
                     'Could not open mailbox %s on %s',
                     folder.path, this.server)
                 connection.select()
                 continue
             result, msgids = this.get_msgids(connection)
             if result != 'OK':
-                logging.error(
+                _logger.error(
                     'Could not search mailbox %s on %s',
                     folder.path, this.server)
                 continue
@@ -103,7 +104,7 @@ class fetchmail_server(models.Model):
                 matched_object_ids += this.apply_matching(
                     connection, folder, msgid, match_algorithm)
 
-            logging.info(
+            _logger.info(
                 'finished checking for emails in %s server %s',
                 folder.path, this.name)
 
@@ -124,7 +125,7 @@ class fetchmail_server(models.Model):
             result, msgdata = connection.fetch(msgid, '(RFC822)')
 
             if result != 'OK':
-                logging.error(
+                _logger.error(
                     'Could not fetch %s in %s on %s',
                     msgid, folder.path, this.server)
                 continue
@@ -151,7 +152,7 @@ class fetchmail_server(models.Model):
                     matched_object_ids += found_ids[:1]
                 except Exception:
                     self.env.cr.execute('rollback to savepoint apply_matching')
-                    logging.exception(
+                    _logger.exception(
                         "Failed to fetch mail %s from %s", msgid, this.name)
             elif folder.flag_nonmatching:
                 connection.store(msgid, '+FLAGS', '\\FLAGGED')
diff --git a/fetchmail_attach_from_folder/wizard/attach_mail_manually.py b/fetchmail_attach_from_folder/wizard/attach_mail_manually.py
index 6e24a5234..666de38bf 100644
--- a/fetchmail_attach_from_folder/wizard/attach_mail_manually.py
+++ b/fetchmail_attach_from_folder/wizard/attach_mail_manually.py
@@ -21,6 +21,7 @@
 ##############################################################################
 from openerp import fields, models
 import logging
+_logger = logging.getLogger(__name__)
 
 
 class attach_mail_manually(models.TransientModel):
@@ -49,14 +50,14 @@ class attach_mail_manually(models.TransientModel):
                 None,
                 'FLAGGED' if folder.flag_nonmatching else 'UNDELETED')
             if result != 'OK':
-                logging.error('Could not search mailbox %s on %s' % (
-                    folder.path, folder.server_id.name))
+                _logger.error('Could not search mailbox %s on %s',
+                              folder.path, folder.server_id.name)
                 continue
             for msgid in msgids[0].split():
                 result, msgdata = connection.fetch(msgid, '(RFC822)')
                 if result != 'OK':
-                    logging.error('Could not fetch %s in %s on %s' % (
-                        msgid, folder.path, folder.server_id.name))
+                    _logger.error('Could not fetch %s in %s on %s',
+                                  msgid, folder.path, folder.server_id.name)
                     continue
                 mail_message = self.pool.get('mail.thread').message_parse(
                     cr, uid, msgdata[0][1],
@@ -80,8 +81,8 @@ class attach_mail_manually(models.TransientModel):
                 connection.select(this.folder_id.path)
                 result, msgdata = connection.fetch(mail.msgid, '(RFC822)')
                 if result != 'OK':
-                    logging.error('Could not fetch %s in %s on %s' % (
-                        mail.msgid, this.folder_id.path, this.server))
+                    _logger.error('Could not fetch %s in %s on %s',
+                                  mail.msgid, this.folder_id.path, this.server)
                     continue
 
                 mail_message = self.pool.get('mail.thread').message_parse(