From: tierno <alfonso.tiernosepulveda@telefonica.com>
Date: Thu, 26 Apr 2018 15:22:09 +0000 (+0200)
Subject: allow read and write for same client with local message
X-Git-Tag: v4.0.0~9
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F44%2F6044%2F2;p=osm%2Fcommon.git

allow read and write for same client with local message

Change-Id: Iaf08e022bc2c0ce1e6cadca10a0499a66d7eaf5c
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
---

diff --git a/osm_common/msglocal.py b/osm_common/msglocal.py
index bfa30b7..8fae7a2 100644
--- a/osm_common/msglocal.py
+++ b/osm_common/msglocal.py
@@ -21,7 +21,8 @@ class MsgLocal(MsgBase):
         self.logger = logging.getLogger(logger_name)
         self.path = None
         # create a different file for each topic
-        self.files = {}
+        self.files_read = {}
+        self.files_write = {}
         self.buffer = {}
 
     def connect(self, config):
@@ -39,7 +40,12 @@ class MsgLocal(MsgBase):
             raise MsgException(str(e))
 
     def disconnect(self):
-        for f in self.files.values():
+        for f in self.files_read.values():
+            try:
+                f.close()
+            except Exception:  # TODO refine
+                pass
+        for f in self.files_write.values():
             try:
                 f.close()
             except Exception:  # TODO refine
@@ -54,10 +60,10 @@ class MsgLocal(MsgBase):
         :return: None or raises and exception
         """
         try:
-            if topic not in self.files:
-                self.files[topic] = open(self.path + topic, "a+")
-            yaml.safe_dump({key: msg}, self.files[topic], default_flow_style=True, width=20000)
-            self.files[topic].flush()
+            if topic not in self.files_write:
+                self.files_write[topic] = open(self.path + topic, "a+")
+            yaml.safe_dump({key: msg}, self.files_write[topic], default_flow_style=True, width=20000)
+            self.files_write[topic].flush()
         except Exception as e:  # TODO refine
             raise MsgException(str(e))
 
@@ -75,10 +81,10 @@ class MsgLocal(MsgBase):
                 topic_list = (topic, )
             while True:
                 for single_topic in topic_list:
-                    if single_topic not in self.files:
-                        self.files[single_topic] = open(self.path + single_topic, "a+")
+                    if single_topic not in self.files_read:
+                        self.files_read[single_topic] = open(self.path + single_topic, "a+")
                         self.buffer[single_topic] = ""
-                    self.buffer[single_topic] += self.files[single_topic].readline()
+                    self.buffer[single_topic] += self.files_read[single_topic].readline()
                     if not self.buffer[single_topic].endswith("\n"):
                         continue
                     msg_dict = yaml.load(self.buffer[single_topic])