[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, 4 insertions, 4 deletions

diff --git a/src/leap/bitmask/hooks.py b/src/leap/bitmask/hooks.py
index fb9771e9..3e9324e0 100644
--- a/src/leap/bitmask/hooks.py
+++ b/src/leap/bitmask/hooks.py
@@ -25,7 +25,7 @@ from twisted.logger import Logger
 from zope.interface import implementer
 
 
-logger = Logger()
+log = Logger()
 
 
 @implementer(IService)
@@ -47,7 +47,7 @@ class HookableService(Service):
     def register_hook(self, name, listener):
         if not hasattr(self, 'event_listeners'):
             self.event_listeners = defaultdict(list)
-        logger.debug('registering hook %s->%s' % (name, listener))
+        log.debug('registering hook %s->%s' % (name, listener))
         self.event_listeners[name].append(listener)
 
     def trigger_hook(self, name, **data):
@@ -55,8 +55,8 @@ class HookableService(Service):
         def react_to_hook(listener, name, **kw):
             try:
                 getattr(listener, 'hook_' + name)(**kw)
-            except AttributeError as exc:
-                logger.failure('Error while triggering hook')
+            except AttributeError:
+                log.failure('Error while triggering hook')
                 raise RuntimeError(
                     "Tried to notify a hook, but the listener "
                     "service class %s does not seem to have "