From cb044a4c4b2c6657876f996617a24a44d1ac3b5d Mon Sep 17 00:00:00 2001
From: Bastian Bloessl <mail@bastibl.net>
Date: Tue, 18 Jun 2019 09:24:35 +0200
Subject: ctrport-monitor: fix error handling
---
gnuradio-runtime/python/gnuradio/ctrlport/monitor.py | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
(limited to 'gnuradio-runtime/python/gnuradio/ctrlport/monitor.py')
diff --git a/gnuradio-runtime/python/gnuradio/ctrlport/monitor.py b/gnuradio-runtime/python/gnuradio/ctrlport/monitor.py
index 3215fa5b26..f8e5882e59 100644
--- a/gnuradio-runtime/python/gnuradio/ctrlport/monitor.py
+++ b/gnuradio-runtime/python/gnuradio/ctrlport/monitor.py
@@ -34,15 +34,11 @@ class monitor(object):
atexit.register(self.shutdown)
# setup export prefs
- gr.prefs().singleton().set_bool("ControlPort","on",True);
+ gr.prefs().singleton().set_bool("ControlPort","on",True)
if(tool == "gr-perf-monitorx"):
- gr.prefs().singleton().set_bool("ControlPort","edges_list",True);
- gr.prefs().singleton().set_bool("PerfCounters","on",True);
- gr.prefs().singleton().set_bool("PerfCounters","export",True);
-
- def __del__(self):
- if(self.started):
- self.stop()
+ gr.prefs().singleton().set_bool("ControlPort","edges_list",True)
+ gr.prefs().singleton().set_bool("PerfCounters","on",True)
+ gr.prefs().singleton().set_bool("PerfCounters","export",True)
def start(self):
print("monitor::endpoints() = %s" % (gr.rpcmanager_get().endpoints()))
@@ -50,7 +46,7 @@ class monitor(object):
ep = gr.rpcmanager_get().endpoints()[0]
cmd = [self.tool, re.search(r"-h (\S+|\d+\.\d+\.\d+\.\d+)", ep).group(1), re.search(r"-p (\d+)", ep).group(1)]
print("running: %s"%(str(cmd)))
- self.proc = subprocess.Popen(cmd);
+ self.proc = subprocess.Popen(cmd)
self.started = True
except (ValueError, OSError):
self.proc = None
@@ -65,6 +61,6 @@ class monitor(object):
print("\tno proc to shut down, exiting")
def shutdown(self):
- print("ctrlport.monitor received shutdown signal")
+ print("ctrlport monitor received shutdown signal")
if(self.started):
self.stop()
--
cgit v1.2.3