[bug] unify logging style using class attr

I changed most of the logger statements to use a class attribute, in
this way it's easier to identify which class it's logging them.

in some cases I leave a module-level logger, when we're either using
functions or when the module it's too small.

at the same time I did a general review and cleanup of the logging
statements.

1 files changed, 5 insertions, 5 deletions

diff --git a/src/leap/bitmask/mail/smtp/service.py b/src/leap/bitmask/mail/smtp/service.py
index 48e6865b..6fd000ce 100644
--- a/src/leap/bitmask/mail/smtp/service.py
+++ b/src/leap/bitmask/mail/smtp/service.py
@@ -26,7 +26,7 @@ from twisted.logger import Logger
 from leap.common.events import emit_async, catalog
 from leap.bitmask.mail.smtp.gateway import SMTPFactory
 
-logger = Logger()
+log = Logger()
 
 SMTP_PORT = 2013
 
@@ -65,9 +65,9 @@ def run_service(soledad_sessions, keymanager_sessions, sendmail_opts,
 
         return tport, factory
     except CannotListenError:
-        logger.error("STMP Service failed to start: "
-                     "cannot listen in port %s" % port)
+        log.error('STMP Service failed to start: '
+                  'cannot listen in port %s' % port)
         emit_async(catalog.SMTP_SERVICE_FAILED_TO_START, str(port))
     except Exception as exc:
-        logger.error("Unhandled error while launching smtp gateway service")
-        logger.error('%r' % exc)
+        log.error('Unhandled error while launching smtp gateway service')
+        log.error('%r' % exc)