Rename run_process to run_or_fail

common.py

@@ -12,8 +12,8 @@ import sys
 import re
 
 
-# Run process, return subprocess object on success, exit script on fail
-def run_process(*argv, **kwargs):
+# Run process, return subprocess object on success, exit script on failure
+def run_or_fail(*argv, **kwargs):
     try:
         p = subprocess.Popen(argv, **kwargs)
     except:

graph.py

@@ -46,7 +46,7 @@ labels = []
 
 
 # Check if the avaliable gnuplot has a required version
-p = run_process("gnuplot", "--version", stdout=subprocess.PIPE)
+p = run_or_fail("gnuplot", "--version", stdout=subprocess.PIPE)
 version = scan(r"gnuplot (\S+)", float, p.stdout.readline().decode())
 if version < GNUPLOT_VERSION_EXPECTED:
     print(f"Error: Gnuplot version too low. Need at least {GNUPLOT_VERSION_EXPECTED} found {version[0]}")
@@ -188,7 +188,7 @@ def graph(session, fname='plot.png'):
 
     read_comments(session)
 
-    gnuplot = run_process("gnuplot", stdin=subprocess.PIPE, stdout=subprocess.PIPE)
+    gnuplot = run_or_fail("gnuplot", stdin=subprocess.PIPE, stdout=subprocess.PIPE)
 
     sdt = datetime.datetime.strptime(START_DATE, '%Y-%m-%d-%H:%M:%S')
     edt = datetime.datetime.strptime(END_DATE, '%Y-%m-%d-%H:%M:%S')

sargraph.py

@@ -27,10 +27,10 @@ def send(sid, msg):
         time.sleep(0.1)
 
 # Check if sar is available
-p = run_process("sar", "-V", stdout=subprocess.PIPE)
+p = run_or_fail("sar", "-V", stdout=subprocess.PIPE)
 
 # Check if screen is available
-p = run_process("screen", "-v", stdout=subprocess.PIPE)
+p = run_or_fail("screen", "-v", stdout=subprocess.PIPE)
 version = scan("Screen version (\d+)", int, p.stdout.readline().decode())
 if version is None:
     print("Error: 'screen' tool returned unknown output!")

watch.py

@@ -136,7 +136,7 @@ def watch(session, fsdev):
 
     my_env = os.environ
     my_env["S_TIME_FORMAT"] = "ISO"
-    p = run_process("sar", "-F", "-u", "-r", "1", stdout=subprocess.PIPE, env=my_env)
+    p = run_or_fail("sar", "-F", "-u", "-r", "1", stdout=subprocess.PIPE, env=my_env)
 
     machine = p.stdout.readline().decode()
     initialize(session, machine)