openstack/dragonflow
Code Issues Proposed changes

Merge "etcd-pubsub: remaining fixes and nits"

Browse Source
This commit is contained in:
Zuul 2017-10-26 12:35:15 +00:00 committed by Gerrit Code Review
commit 9b91f65f41
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dragonflow/db/pubsub_drivers/etcd_pubsub_driver.py
View File

@ -83,7 +83,7 @@ class WatcherThread(threading.Thread):
class EtcdSubscriberAgent(pub_sub_api.SubscriberApi): class EtcdSubscriberAgent(pub_sub_api.SubscriberApi):
def __init__(self): def __init__(self):
self.topic_list = {} self.topic_dict = {}
self.uri_list = [] self.uri_list = []
self.running = False self.running = False
self.client = None self.client = None
@ -107,19 +107,19 @@ class EtcdSubscriberAgent(pub_sub_api.SubscriberApi):
def daemonize(self): def daemonize(self):
# Start watching # Start watching
self.running = True self.running = True
for topic in self.topic_list: for topic in self.topic_dict:
self.topic_list[topic].start() self.topic_dict[topic].start()
def close(self): def close(self):
self.running = False self.running = False
for topic in self.topic_list: for topic, thread in self.topic_dict.items():
self._stop_topic_thread(self.topic_list[topic]) self._stop_topic_thread(thread)
def register_topic(self, topic): def register_topic(self, topic):
LOG.info('Register topic %s', topic) LOG.info('Register topic %s', topic)
if topic not in self.topic_list: if topic not in self.topic_dict:
topic_thread = self._create_topic_thread(topic) topic_thread = self._create_topic_thread(topic)
self.topic_list[topic] = topic_thread self.topic_dict[topic] = topic_thread
if self.running: if self.running:
topic_thread.start() topic_thread.start()
return True return True
@ -127,9 +127,9 @@ class EtcdSubscriberAgent(pub_sub_api.SubscriberApi):
def unregister_topic(self, topic): def unregister_topic(self, topic):
LOG.info('Unregister topic %s', topic) LOG.info('Unregister topic %s', topic)
topic_thread = self.topic_dict.pop(topic)
if self.running: if self.running:
self._stop_topic_thread(self.topic_list[topic]) self._stop_topic_thread(topic_thread)
del self.topic_list[topic]
def _stop_topic_thread(self, topic_thread): def _stop_topic_thread(self, topic_thread):
topic_thread.cancel() topic_thread.cancel()