fixed issue #541, also fixed same issue in clonesrv6.py

booksbyus · Sep 16, 2015 · 4e4634b · 4e4634b
1 parent 918efb2
commit 4e4634b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/examples/Python/clonesrv5.py b/examples/Python/clonesrv5.py
@@ -109,8 +109,8 @@ def handle_collect(self, msg):
         self.sequence += 1
         kvmsg.sequence = self.sequence
         kvmsg.send(self.publisher)
-        ttl = kvmsg.get('ttl')
-        if ttl is not None:
+        ttl = float(kvmsg.get('ttl', 0))
+        if ttl:
             kvmsg['ttl'] = time.time() + ttl
         kvmsg.store(self.kvmap)
         logging.info("I: publishing update=%d", self.sequence)
@@ -123,7 +123,8 @@ def flush_ttl(self):
     def flush_single(self, kvmsg):
         """If key-value pair has expired, delete it and publish the fact
         to listening clients."""
-        if kvmsg.get('ttl', 0) <= time.time():
+        ttl = float(kvmsg.get('ttl', 0))
+        if ttl and ttl <= time.time():
             kvmsg.body = ""
             self.sequence += 1
             kvmsg.sequence = self.sequence

diff --git a/examples/Python/clonesrv6.py b/examples/Python/clonesrv6.py
@@ -142,7 +142,7 @@ def handle_collect(self, msg):
             self.sequence += 1
             kvmsg.sequence = self.sequence
             kvmsg.send(self.publisher)
-            ttl = int(kvmsg.get('ttl'))
+            ttl = float(kvmsg.get('ttl', 0))
             if ttl:
                 kvmsg['ttl'] = time.time() + ttl
             kvmsg.store(self.kvmap)
@@ -175,7 +175,7 @@ def flush_ttl(self):
     def flush_single(self, kvmsg):
         """If key-value pair has expired, delete it and publish the fact
         to listening clients."""
-        ttl = int(kvmsg.get('ttl'))
+        ttl = float(kvmsg.get('ttl', 0))
         if ttl and ttl <= time.time():
             kvmsg.body = ""
             self.sequence += 1
@@ -256,9 +256,9 @@ def handle_subscriber(self, msg):
 
         # Find and remove update off pending list
         kvmsg = KVMsg.from_msg(msg)
-        # update integer ttl -> timestamp
-        ttl = int(kvmsg.get('ttl'))
-        if ttl is not None:
+        # update float ttl -> timestamp
+        ttl = float(kvmsg.get('ttl', 0))
+        if ttl:
             kvmsg['ttl'] = time.time() + ttl
 
         if kvmsg.key != "HUGZ":