diff options
| author | Kali Kaneko <kali@leap.se> | 2016-09-20 17:07:14 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2016-09-20 17:07:14 -0400 |
| commit | a889a5480b3807d887c3f196963236b2667bb8fa (patch) | |
| tree | 47b3dced8e2925ca1e5cede25223e866ef61e80d /src/leap/common/events/txclient.py | |
| parent | f063726b3ad003693010555d57dbc214f6abb01d (diff) | |
| parent | 34ee56766446a1072599bd5641ffdf2a89442462 (diff) | |
Merge branch 'debian/experimental' into debian/platform-0.9
Diffstat (limited to 'src/leap/common/events/txclient.py')
| -rw-r--r-- | src/leap/common/events/txclient.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/leap/common/events/txclient.py b/src/leap/common/events/txclient.py index dfd0533..63f12d7 100644 --- a/src/leap/common/events/txclient.py +++ b/src/leap/common/events/txclient.py @@ -58,16 +58,19 @@ class EventsTxClient(TxZmqClientComponent, EventsClient): """ def __init__(self, emit_addr=EMIT_ADDR, reg_addr=REG_ADDR, - path_prefix=None): + path_prefix=None, factory=None, enable_curve=True): """ - Initialize the events server. + Initialize the events client. """ - TxZmqClientComponent.__init__(self, path_prefix=path_prefix) + TxZmqClientComponent.__init__( + self, path_prefix=path_prefix, factory=factory, + enable_curve=enable_curve) EventsClient.__init__(self, emit_addr, reg_addr) # connect SUB first, otherwise we might miss some event sent from this # same client self._sub = self._zmq_connect(txzmq.ZmqSubConnection, reg_addr) self._sub.gotMessage = self._gotMessage + self._push = self._zmq_connect(txzmq.ZmqPushConnection, emit_addr) def _gotMessage(self, msg, tag): @@ -122,7 +125,6 @@ class EventsTxClient(TxZmqClientComponent, EventsClient): callback(event, *content) def shutdown(self): - TxZmqClientComponent.shutdown(self) EventsClient.shutdown(self) |