From 199bb557a9977a4bf0783ce17a13b50402ae264e Mon Sep 17 00:00:00 2001 From: amanand Date: Wed, 5 Oct 2016 14:29:05 +0530 Subject: [PATCH] Fixed minor issue in the lwaftr monitor & a mutex issue in the daemonized jetapp. --- jetapp/yang/op/rpc-jet.py | 3 ++- jetapp/yang/op/rpc_monitor_lwaftr.py | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/jetapp/yang/op/rpc-jet.py b/jetapp/yang/op/rpc-jet.py index e24d0ab8b8..2842b9244d 100755 --- a/jetapp/yang/op/rpc-jet.py +++ b/jetapp/yang/op/rpc-jet.py @@ -51,10 +51,11 @@ def lwaftr_snmp(self): try: with open(SNABB_FILENAME, "r") as f: output = f.read() + mutex.release() except Exception as e: print "lwaftr_snmp hit exception: ", e.message output = self.lwaftr() - mutex.release() + mutex.release() return output diff --git a/jetapp/yang/op/rpc_monitor_lwaftr.py b/jetapp/yang/op/rpc_monitor_lwaftr.py index 640784ca1d..baea45fbfa 100755 --- a/jetapp/yang/op/rpc_monitor_lwaftr.py +++ b/jetapp/yang/op/rpc_monitor_lwaftr.py @@ -98,11 +98,16 @@ def monitor(self, server, argv): jcs.output("%s" %e.message) exit(0) # newstats contains all the latest stats + instance_id = "" + for i in range(0,len(argv)): + if argv[i] == "id": + instance_id = argv[i+1] + break newtime = time.time() root = ET.fromstring(newstats) found = 0 for instance in root: - if len(argv) != 1 and instance.findall("./id")[0].text != argv[2]: + if instance_id != "" and instance.findall("./id")[0].text != argv[2]: pass else: self.id = instance.findall("./id")[0].text