summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/leap/bitmask/logs/safezmqhandler.py9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/leap/bitmask/logs/safezmqhandler.py b/src/leap/bitmask/logs/safezmqhandler.py
index 6d2c4f50..4e5f59e4 100644
--- a/src/leap/bitmask/logs/safezmqhandler.py
+++ b/src/leap/bitmask/logs/safezmqhandler.py
@@ -19,11 +19,9 @@ A thread-safe zmq handler for LogBook.
"""
import json
import threading
-from distutils.version import LooseVersion
from logbook.queues import ZeroMQHandler
from logbook import NOTSET
-from logbook import __version__ as LOGBOOK_VERSION
import zmq
@@ -55,12 +53,7 @@ class SafeZMQHandler(ZeroMQHandler):
# instead of calling the ZeroMQHandler's one.
# The best approach may be to inherit directly from `logbook.Handler`.
- args = (self, uri, level, filter, bubble, context)
-
- # Workaround for an API change: version 0.6.0 in trusty doesn't accepts
- # the multi parameter.
- if LooseVersion(LOGBOOK_VERSION) >= LooseVersion('0.7.0'):
- args += (multi,)
+ args = (self, uri, level, filter, bubble, context, multi)
ZeroMQHandler.__init__(*args)
current_id = self._get_caller_id()