From 32658ae3108bc67a102cf6e0153d468b3a8ae1b0 Mon Sep 17 00:00:00 2001
From: Ivan Alejandro <ivanalejandro0@gmail.com>
Date: Fri, 12 Jun 2015 14:34:18 -0300
Subject: [feat] replace old log handler with new one

Replace logging.getLogger with custom get_logger.
Remove some unneeded dependencies and reorder other.
---
 src/leap/bitmask/services/__init__.py                    | 4 ++--
 src/leap/bitmask/services/abstractbootstrapper.py        | 5 ++---
 src/leap/bitmask/services/eip/conductor.py               | 5 ++---
 src/leap/bitmask/services/eip/darwinvpnlauncher.py       | 4 ++--
 src/leap/bitmask/services/eip/eipbootstrapper.py         | 4 ++--
 src/leap/bitmask/services/eip/eipconfig.py               | 3 ++-
 src/leap/bitmask/services/eip/linuxvpnlauncher.py        | 4 ++--
 src/leap/bitmask/services/eip/vpnlauncher.py             | 4 ++--
 src/leap/bitmask/services/eip/vpnprocess.py              | 9 ++++-----
 src/leap/bitmask/services/eip/windowsvpnlauncher.py      | 5 ++---
 src/leap/bitmask/services/mail/conductor.py              | 5 ++---
 src/leap/bitmask/services/mail/imap.py                   | 4 ++--
 src/leap/bitmask/services/mail/imapcontroller.py         | 6 ++----
 src/leap/bitmask/services/mail/plumber.py                | 4 ++--
 src/leap/bitmask/services/mail/smtpbootstrapper.py       | 4 ++--
 src/leap/bitmask/services/mail/smtpconfig.py             | 4 ++--
 src/leap/bitmask/services/soledad/soledadbootstrapper.py | 4 ++--
 src/leap/bitmask/services/soledad/soledadconfig.py       | 5 ++---
 18 files changed, 38 insertions(+), 45 deletions(-)

(limited to 'src/leap/bitmask/services')

diff --git a/src/leap/bitmask/services/__init__.py b/src/leap/bitmask/services/__init__.py
index ba12ba4e..54426669 100644
--- a/src/leap/bitmask/services/__init__.py
+++ b/src/leap/bitmask/services/__init__.py
@@ -17,7 +17,6 @@
 """
 Services module.
 """
-import logging
 import os
 import sys
 
@@ -25,6 +24,7 @@ from PySide import QtCore
 
 from leap.bitmask.config import flags
 from leap.bitmask.crypto.srpauth import SRPAuth
+from leap.bitmask.logs.utils import get_logger
 from leap.bitmask.util.constants import REQUEST_TIMEOUT
 from leap.bitmask.util.privilege_policies import is_missing_policy_permissions
 from leap.bitmask.util.request_helpers import get_content
@@ -34,7 +34,7 @@ from leap.common.check import leap_assert
 from leap.common.config.baseconfig import BaseConfig
 from leap.common.files import get_mtime
 
-logger = logging.getLogger(__name__)
+logger = get_logger()
 
 
 EIP_SERVICE = u"openvpn"
diff --git a/src/leap/bitmask/services/abstractbootstrapper.py b/src/leap/bitmask/services/abstractbootstrapper.py
index 77929b75..6a08f475 100644
--- a/src/leap/bitmask/services/abstractbootstrapper.py
+++ b/src/leap/bitmask/services/abstractbootstrapper.py
@@ -18,8 +18,6 @@
 """
 Abstract bootstrapper implementation
 """
-import logging
-
 import requests
 
 from functools import partial
@@ -30,9 +28,10 @@ from twisted.python import log
 from twisted.internet import threads
 from twisted.internet.defer import CancelledError
 
+from leap.bitmask.logs.utils import get_logger
 from leap.common.check import leap_assert, leap_assert_type
 
-logger = logging.getLogger(__name__)
+logger = get_logger()
 
 
 class AbstractBootstrapper(QtCore.QObject):
diff --git a/src/leap/bitmask/services/eip/conductor.py b/src/leap/bitmask/services/eip/conductor.py
index 3fc88724..3386dddf 100644
--- a/src/leap/bitmask/services/eip/conductor.py
+++ b/src/leap/bitmask/services/eip/conductor.py
@@ -20,10 +20,9 @@ EIP Conductor module.
 This handles Qt Signals and triggers the calls to the backend,
 where the VPNProcess has been initialized.
 """
-import logging
-
 from PySide import QtCore
 
+from leap.bitmask.logs.utils import get_logger
 from leap.bitmask.gui import statemachines
 from leap.bitmask.services import EIP_SERVICE
 from leap.bitmask.services import get_service_display_name
@@ -31,7 +30,7 @@ from leap.bitmask.services.eip.connection import EIPConnection
 from leap.bitmask.platform_init import IS_MAC
 
 QtDelayedCall = QtCore.QTimer.singleShot
-logger = logging.getLogger(__name__)
+logger = get_logger()
 
 
 class EIPConductor(object):
diff --git a/src/leap/bitmask/services/eip/darwinvpnlauncher.py b/src/leap/bitmask/services/eip/darwinvpnlauncher.py
index f83e0170..17fc11c2 100644
--- a/src/leap/bitmask/services/eip/darwinvpnlauncher.py
+++ b/src/leap/bitmask/services/eip/darwinvpnlauncher.py
@@ -19,15 +19,15 @@ Darwin VPN launcher implementation.
 """
 import commands
 import getpass
-import logging
 import os
 import sys
 
+from leap.bitmask.logs.utils import get_logger
 from leap.bitmask.services.eip.vpnlauncher import VPNLauncher
 from leap.bitmask.services.eip.vpnlauncher import VPNLauncherException
 from leap.bitmask.util import get_path_prefix
 
-logger = logging.getLogger(__name__)
+logger = get_logger()
 
 
 class EIPNoTunKextLoaded(VPNLauncherException):
diff --git a/src/leap/bitmask/services/eip/eipbootstrapper.py b/src/leap/bitmask/services/eip/eipbootstrapper.py
index f78113bc..7a331d71 100644
--- a/src/leap/bitmask/services/eip/eipbootstrapper.py
+++ b/src/leap/bitmask/services/eip/eipbootstrapper.py
@@ -17,11 +17,11 @@
 """
 EIP bootstrapping
 """
-import logging
 import os
 
 from leap.bitmask.config.providerconfig import ProviderConfig
 from leap.bitmask.crypto.certs import download_client_cert
+from leap.bitmask.logs.utils import get_logger
 from leap.bitmask.services import download_service_config
 from leap.bitmask.services.abstractbootstrapper import AbstractBootstrapper
 from leap.bitmask.services.eip.eipconfig import EIPConfig
@@ -29,7 +29,7 @@ from leap.common import certs as leap_certs
 from leap.common.check import leap_assert, leap_assert_type
 from leap.common.files import check_and_fix_urw_only
 
-logger = logging.getLogger(__name__)
+logger = get_logger()
 
 
 class EIPBootstrapper(AbstractBootstrapper):
diff --git a/src/leap/bitmask/services/eip/eipconfig.py b/src/leap/bitmask/services/eip/eipconfig.py
index d5947eb1..b1d08393 100644
--- a/src/leap/bitmask/services/eip/eipconfig.py
+++ b/src/leap/bitmask/services/eip/eipconfig.py
@@ -26,12 +26,13 @@ import ipaddr
 
 from leap.bitmask.config import flags
 from leap.bitmask.config.providerconfig import ProviderConfig
+from leap.bitmask.logs.utils import get_logger
 from leap.bitmask.services import ServiceConfig
 from leap.bitmask.services.eip.eipspec import get_schema
 from leap.bitmask.util import get_path_prefix
 from leap.common.check import leap_assert, leap_assert_type
 
-logger = logging.getLogger(__name__)
+logger = get_logger()
 
 
 def get_eipconfig_path(domain, relative=True):
diff --git a/src/leap/bitmask/services/eip/linuxvpnlauncher.py b/src/leap/bitmask/services/eip/linuxvpnlauncher.py
index a3ab408b..cf14a8f9 100644
--- a/src/leap/bitmask/services/eip/linuxvpnlauncher.py
+++ b/src/leap/bitmask/services/eip/linuxvpnlauncher.py
@@ -18,11 +18,11 @@
 Linux VPN launcher implementation.
 """
 import commands
-import logging
 import os
 import sys
 
 from leap.bitmask.config import flags
+from leap.bitmask.logs.utils import get_logger
 from leap.bitmask.util.privilege_policies import LinuxPolicyChecker
 from leap.bitmask.util.privilege_policies import NoPolkitAuthAgentAvailable
 from leap.bitmask.util.privilege_policies import NoPkexecAvailable
@@ -31,7 +31,7 @@ from leap.bitmask.services.eip.vpnlauncher import VPNLauncherException
 from leap.bitmask.util import get_path_prefix, force_eval
 from leap.bitmask.util import first
 
-logger = logging.getLogger(__name__)
+logger = get_logger()
 
 COM = commands
 
diff --git a/src/leap/bitmask/services/eip/vpnlauncher.py b/src/leap/bitmask/services/eip/vpnlauncher.py
index 7793d624..c48f857c 100644
--- a/src/leap/bitmask/services/eip/vpnlauncher.py
+++ b/src/leap/bitmask/services/eip/vpnlauncher.py
@@ -19,7 +19,6 @@ Platform independant VPN launcher interface.
 """
 import getpass
 import hashlib
-import logging
 import os
 import stat
 
@@ -27,6 +26,7 @@ from abc import ABCMeta, abstractmethod
 from functools import partial
 
 from leap.bitmask.config import flags
+from leap.bitmask.logs.utils import get_logger
 from leap.bitmask.backend.settings import Settings, GATEWAY_AUTOMATIC
 from leap.bitmask.config.providerconfig import ProviderConfig
 from leap.bitmask.platform_init import IS_LINUX
@@ -35,7 +35,7 @@ from leap.bitmask.util import force_eval
 from leap.common.check import leap_assert, leap_assert_type
 
 
-logger = logging.getLogger(__name__)
+logger = get_logger()
 
 
 class VPNLauncherException(Exception):
diff --git a/src/leap/bitmask/services/eip/vpnprocess.py b/src/leap/bitmask/services/eip/vpnprocess.py
index 3e46418c..586b50f5 100644
--- a/src/leap/bitmask/services/eip/vpnprocess.py
+++ b/src/leap/bitmask/services/eip/vpnprocess.py
@@ -18,7 +18,6 @@
 VPN Manager, spawned in a custom processProtocol.
 """
 import commands
-import logging
 import os
 import shutil
 import socket
@@ -39,6 +38,7 @@ except ImportError:
 
 from leap.bitmask.config import flags
 from leap.bitmask.config.providerconfig import ProviderConfig
+from leap.bitmask.logs.utils import get_logger
 from leap.bitmask.services.eip import get_vpn_launcher
 from leap.bitmask.services.eip import linuxvpnlauncher
 from leap.bitmask.services.eip.eipconfig import EIPConfig
@@ -47,13 +47,12 @@ from leap.bitmask.util import first, force_eval
 from leap.bitmask.platform_init import IS_MAC, IS_LINUX
 from leap.common.check import leap_assert, leap_assert_type
 
-logger = logging.getLogger(__name__)
-vpnlog = logging.getLogger('leap.openvpn')
-
 from twisted.internet import defer, protocol, reactor
 from twisted.internet import error as internet_error
 from twisted.internet.task import LoopingCall
 
+logger = get_logger()
+
 
 class VPNObserver(object):
     """
@@ -884,7 +883,7 @@ class VPNProcess(protocol.ProcessProtocol, VPNManager):
         """
         # truncate the newline
         line = data[:-1]
-        vpnlog.info(line)
+        logger.info(line)
         self._vpn_observer.watch(line)
 
     def processExited(self, reason):
diff --git a/src/leap/bitmask/services/eip/windowsvpnlauncher.py b/src/leap/bitmask/services/eip/windowsvpnlauncher.py
index 3f1ed43b..aaa3e45f 100644
--- a/src/leap/bitmask/services/eip/windowsvpnlauncher.py
+++ b/src/leap/bitmask/services/eip/windowsvpnlauncher.py
@@ -17,12 +17,11 @@
 """
 Windows VPN launcher implementation.
 """
-import logging
-
+from leap.bitmask.logs.utils import get_logger
 from leap.bitmask.services.eip.vpnlauncher import VPNLauncher
 from leap.common.check import leap_assert
 
-logger = logging.getLogger(__name__)
+logger = get_logger()
 
 
 class WindowsVPNLauncher(VPNLauncher):
diff --git a/src/leap/bitmask/services/mail/conductor.py b/src/leap/bitmask/services/mail/conductor.py
index 2f1d20e6..68197d9d 100644
--- a/src/leap/bitmask/services/mail/conductor.py
+++ b/src/leap/bitmask/services/mail/conductor.py
@@ -17,9 +17,8 @@
 """
 Mail Services Conductor
 """
-import logging
-
 from leap.bitmask.config import flags
+from leap.bitmask.logs.utils import get_logger
 from leap.bitmask.gui import statemachines
 from leap.bitmask.services.mail import connection as mail_connection
 from leap.bitmask.services.mail.emailfirewall import get_email_firewall
@@ -28,7 +27,7 @@ from leap.common.events import catalog
 from leap.common.events import register as leap_register
 
 
-logger = logging.getLogger(__name__)
+logger = get_logger()
 
 
 class IMAPControl(object):
diff --git a/src/leap/bitmask/services/mail/imap.py b/src/leap/bitmask/services/mail/imap.py
index 30646a63..5934756d 100644
--- a/src/leap/bitmask/services/mail/imap.py
+++ b/src/leap/bitmask/services/mail/imap.py
@@ -17,16 +17,16 @@
 """
 Initialization of imap service
 """
-import logging
 import os
 import sys
 
+from leap.bitmask.logs.utils import get_logger
 from leap.mail.constants import INBOX_NAME
 from leap.mail.imap.service import imap
 from leap.mail.incoming.service import IncomingMail, INCOMING_CHECK_PERIOD
 from twisted.python import log
 
-logger = logging.getLogger(__name__)
+logger = get_logger()
 
 # The name of the environment variable that has to be
 # set to override the default time value, in seconds.
diff --git a/src/leap/bitmask/services/mail/imapcontroller.py b/src/leap/bitmask/services/mail/imapcontroller.py
index d374ac29..e5313477 100644
--- a/src/leap/bitmask/services/mail/imapcontroller.py
+++ b/src/leap/bitmask/services/mail/imapcontroller.py
@@ -17,12 +17,10 @@
 """
 IMAP service controller.
 """
-import logging
-
+from leap.bitmask.logs.utils import get_logger
 from leap.bitmask.services.mail import imap
 
-
-logger = logging.getLogger(__name__)
+logger = get_logger()
 
 
 class IMAPController(object):
diff --git a/src/leap/bitmask/services/mail/plumber.py b/src/leap/bitmask/services/mail/plumber.py
index 58625db5..43203f0c 100644
--- a/src/leap/bitmask/services/mail/plumber.py
+++ b/src/leap/bitmask/services/mail/plumber.py
@@ -30,6 +30,7 @@ from twisted.internet import defer
 
 from leap.bitmask.backend.settings import Settings
 from leap.bitmask.config.providerconfig import ProviderConfig
+from leap.bitmask.logs.utils import get_logger
 from leap.bitmask.provider import get_provider_path
 from leap.bitmask.services.soledad.soledadbootstrapper import get_db_paths
 from leap.bitmask.util import flatten, get_path_prefix
@@ -37,8 +38,7 @@ from leap.bitmask.util import flatten, get_path_prefix
 from leap.mail.imap.account import IMAPAccount
 from leap.soledad.client import Soledad
 
-logger = logging.getLogger(__name__)
-logger.setLevel(logging.DEBUG)
+logger = get_logger()
 
 
 def initialize_soledad(uuid, email, passwd,
diff --git a/src/leap/bitmask/services/mail/smtpbootstrapper.py b/src/leap/bitmask/services/mail/smtpbootstrapper.py
index 6f45469b..cd871803 100644
--- a/src/leap/bitmask/services/mail/smtpbootstrapper.py
+++ b/src/leap/bitmask/services/mail/smtpbootstrapper.py
@@ -17,11 +17,11 @@
 """
 SMTP bootstrapping
 """
-import logging
 import os
 
 from leap.bitmask.config.providerconfig import ProviderConfig
 from leap.bitmask.crypto.certs import download_client_cert
+from leap.bitmask.logs.utils import get_logger
 from leap.bitmask.services import download_service_config
 from leap.bitmask.services.abstractbootstrapper import AbstractBootstrapper
 from leap.bitmask.services.mail.smtpconfig import SMTPConfig
@@ -31,7 +31,7 @@ from leap.common import certs as leap_certs
 from leap.common.check import leap_assert
 from leap.common.files import check_and_fix_urw_only
 
-logger = logging.getLogger(__name__)
+logger = get_logger()
 
 
 class NoSMTPHosts(Exception):
diff --git a/src/leap/bitmask/services/mail/smtpconfig.py b/src/leap/bitmask/services/mail/smtpconfig.py
index 09f90314..2d8de411 100644
--- a/src/leap/bitmask/services/mail/smtpconfig.py
+++ b/src/leap/bitmask/services/mail/smtpconfig.py
@@ -17,16 +17,16 @@
 """
 SMTP configuration
 """
-import logging
 import os
 
 from leap.bitmask.config.providerconfig import ProviderConfig
+from leap.bitmask.logs.utils import get_logger
 from leap.bitmask.services import ServiceConfig
 from leap.bitmask.services.mail.smtpspec import get_schema
 from leap.bitmask.util import get_path_prefix
 from leap.common.check import leap_assert, leap_assert_type
 
-logger = logging.getLogger(__name__)
+logger = get_logger()
 
 
 class SMTPConfig(ServiceConfig):
diff --git a/src/leap/bitmask/services/soledad/soledadbootstrapper.py b/src/leap/bitmask/services/soledad/soledadbootstrapper.py
index 9864e4e1..242bfb3d 100644
--- a/src/leap/bitmask/services/soledad/soledadbootstrapper.py
+++ b/src/leap/bitmask/services/soledad/soledadbootstrapper.py
@@ -17,7 +17,6 @@
 """
 Soledad bootstrapping
 """
-import logging
 import os
 import socket
 import sys
@@ -32,6 +31,7 @@ from pysqlcipher.dbapi2 import ProgrammingError as sqlcipher_ProgrammingError
 from leap.bitmask.config import flags
 from leap.bitmask.config.providerconfig import ProviderConfig
 from leap.bitmask.crypto.srpauth import SRPAuth
+from leap.bitmask.logs.utils import get_logger
 from leap.bitmask.services import download_service_config
 from leap.bitmask.services.abstractbootstrapper import AbstractBootstrapper
 from leap.bitmask.services.soledad.soledadconfig import SoledadConfig
@@ -46,7 +46,7 @@ from leap.soledad.common.errors import InvalidAuthTokenError
 from leap.soledad.client import Soledad
 from leap.soledad.client.secrets import BootstrapSequenceError
 
-logger = logging.getLogger(__name__)
+logger = get_logger()
 
 """
 These mocks are replicated from imap tests and the repair utility.
diff --git a/src/leap/bitmask/services/soledad/soledadconfig.py b/src/leap/bitmask/services/soledad/soledadconfig.py
index d3cc7da4..8052bcdb 100644
--- a/src/leap/bitmask/services/soledad/soledadconfig.py
+++ b/src/leap/bitmask/services/soledad/soledadconfig.py
@@ -17,12 +17,11 @@
 """
 Soledad configuration
 """
-import logging
-
+from leap.bitmask.logs.utils import get_logger
 from leap.bitmask.services import ServiceConfig
 from leap.bitmask.services.soledad.soledadspec import get_schema
 
-logger = logging.getLogger(__name__)
+logger = get_logger()
 
 
 class SoledadConfig(ServiceConfig):
-- 
cgit v1.2.3