From e5f553801b1df47932c65e1372448d6f05701e0a Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Tue, 8 May 2018 13:35:30 -0400 Subject: [PATCH] Fix reuse of channel for receiving changes --- confluent_server/confluent/collective/manager.py | 3 ++- confluent_server/confluent/config/configmanager.py | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/confluent_server/confluent/collective/manager.py b/confluent_server/confluent/collective/manager.py index 807259d0..15d69d63 100644 --- a/confluent_server/confluent/collective/manager.py +++ b/confluent_server/confluent/collective/manager.py @@ -48,7 +48,8 @@ def connect_to_leader(cert=None, name=None): raise Exception("Certificate mismatch in the collective") tlvdata.recv(remote) # the banner tlvdata.recv(remote) # authpassed... 0.. - tlvdata.send(remote, {'collective': {'operation': 'connect', 'name': name}}) + tlvdata.send(remote, {'collective': {'operation': 'connect', + 'name': name}}) keydata = tlvdata.recv(remote) colldata = tlvdata.recv(remote) globaldata = tlvdata.recv(remote) diff --git a/confluent_server/confluent/config/configmanager.py b/confluent_server/confluent/config/configmanager.py index c8cf99ed..8f0db2b9 100644 --- a/confluent_server/confluent/config/configmanager.py +++ b/confluent_server/confluent/config/configmanager.py @@ -416,8 +416,7 @@ def follow_channel(channel): _txcount = rpc['txcount'] if 'xid' in rpc: _pendingchangesets[rpc['xid']].send() - - + msg = channel.recv(8) def add_collective_member(name, address, fingerprint): try: