diff options
| author | Kali Kaneko <kali@leap.se> | 2015-08-31 14:54:52 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2015-08-31 14:54:52 -0400 |
| commit | f4547479fc050f338845f4f546d8dd7c0e4512eb (patch) | |
| tree | 0f737c7f102674230f5467ecaf17720e1d28f6eb /src/leap/bitmask/services/eip/conductor.py | |
| parent | dd43dad4b150adb66e571a56a8a5c053dec858d0 (diff) | |
| parent | fd27f48a35736d8ba186c423a7de15ffee5143dd (diff) | |
Merge tag '0.9.0rc2' into debian/experimental
Tag leap.bitmask version 0.9.0rc2
Diffstat (limited to 'src/leap/bitmask/services/eip/conductor.py')
| -rw-r--r-- | src/leap/bitmask/services/eip/conductor.py | 5 |
1 files changed, 2 insertions, 3 deletions
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): |