diff options
| author | Kali Kaneko <kali@leap.se> | 2013-10-30 12:19:22 -0200 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2013-10-30 12:19:22 -0200 |
| commit | ee34892ea25bce23b0fc85a73eb26ca29962b608 (patch) | |
| tree | f338884e30e6d06c3ae746bd4298e342b0c7aae9 | |
| parent | e959577c7c86689820d75e460ebee23209692a7d (diff) | |
| parent | f60a971f37b9a9e0ee1115faaaae6aadbd91f3cf (diff) | |
Merge remote-tracking branch 'chiiph/bug/log_eip_events' into develop
| -rw-r--r-- | changes/log_eip_status | 1 | ||||
| -rw-r--r-- | src/leap/bitmask/gui/eip_status.py | 4 | ||||
| -rw-r--r-- | src/leap/bitmask/gui/statemachines.py | 4 |
3 files changed, 7 insertions, 2 deletions
diff --git a/changes/log_eip_status b/changes/log_eip_status new file mode 100644 index 00000000..97153fd7 --- /dev/null +++ b/changes/log_eip_status @@ -0,0 +1 @@ + - Properly log EIP status changes. diff --git a/src/leap/bitmask/gui/eip_status.py b/src/leap/bitmask/gui/eip_status.py index 77685cd3..324586c0 100644 --- a/src/leap/bitmask/gui/eip_status.py +++ b/src/leap/bitmask/gui/eip_status.py @@ -269,6 +269,10 @@ class EIPStatusWidget(QtGui.QWidget): :type error: bool """ leap_assert_type(error, bool) + if error: + logger.error(status) + else: + logger.debug(status) self._eip_status = status if error: status = "<font color='red'>%s</font>" % (status,) diff --git a/src/leap/bitmask/gui/statemachines.py b/src/leap/bitmask/gui/statemachines.py index ee16a4c6..386cb75f 100644 --- a/src/leap/bitmask/gui/statemachines.py +++ b/src/leap/bitmask/gui/statemachines.py @@ -55,8 +55,8 @@ class SignallingState(QState): """ Emits the signal on entry. """ - logger.debug('State %s entered. Emitting signal ...' - % (self._name + self.__class__.__name__)) + logger.debug('State %s::%s entered. Emitting signal ...' + % (self._name, self.objectName())) if self._signal is not None: self._signal.emit() |