diff options
author | Kali Kaneko <kali@leap.se> | 2016-04-25 19:15:25 -0400 |
---|---|---|
committer | Kali Kaneko <kali@leap.se> | 2016-04-25 19:15:25 -0400 |
commit | 3b413203993a0490f3adf9c0737c207be263eb07 (patch) | |
tree | ee01d71115b1163435ecac39f4769a39165b1eae /src/leap/common/events/txclient.py | |
parent | ba868e93c967cc8e9521471163f9127b63da1949 (diff) | |
parent | cef15c04610ee188052af78ead8cfe7ea29d81c6 (diff) |
Merge tag '0.5.1' into debian/experimental
Tag leap.bitmask version 0.5.1
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) |