diff options
| author | Kali Kaneko <kali@leap.se> | 2016-03-24 09:48:47 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2016-03-24 09:48:47 -0400 |
| commit | 0b7956b8b9dd07a788a90e752c10c77f896b2af2 (patch) | |
| tree | eaec05ba04b6fe009acc8304779997128283fa41 | |
| parent | ecf025e3d6065c9729ac72489efcdc0218fdffe1 (diff) | |
| parent | 3a317f04bfa55698a7064ea3d5c5a1b4cc5ead36 (diff) | |
Merge remote-tracking branch 'leapcode/pr/139' into develop
| -rw-r--r-- | src/leap/common/events/auth.py | 4 | ||||
| -rw-r--r-- | src/leap/common/events/zmq_components.py | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/leap/common/events/auth.py b/src/leap/common/events/auth.py index 5b71f2d..db217ca 100644 --- a/src/leap/common/events/auth.py +++ b/src/leap/common/events/auth.py @@ -76,6 +76,10 @@ class TxAuthenticator(ZmqConnection): user_id, metadata] self.send(reply) + def shutdown(self): + if self.factory: + super(TxAuthenticator, self).shutdown() + class TxAuthenticationRequest(ZmqConnection): diff --git a/src/leap/common/events/zmq_components.py b/src/leap/common/events/zmq_components.py index 8919cd9..c533a74 100644 --- a/src/leap/common/events/zmq_components.py +++ b/src/leap/common/events/zmq_components.py @@ -158,6 +158,7 @@ class TxZmqComponent(object): public_keys_dir = os.path.join(self._config_prefix, PUBLIC_KEYS_PREFIX) auth_req.configure_curve(domain="*", location=public_keys_dir) auth_req.shutdown() + TxZmqComponent._auth.shutdown() # This has to be set before binding the socket, that's why this method # has to be called before addEndpoints() |