Macintosh-HW/RASCSI
1
0
Fork 0
mirror of https://github.com/akuker/RASCSI.git synced 2024-12-22 15:30:09 +00:00
Code Issues Projects Releases Wiki Activity

Error handling in subprocess run (#516)

Browse Source
This commit is contained in:
Daniel Markstedt 2021-12-12 09:13:19 -08:00 committed by GitHub
parent 0abbff200e
commit aa0e5a287b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 63 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
src/web/pi_cmds.py
View File

@ -44,24 +44,36 @@ def running_env():
git contains the git hash of the checked out code git contains the git hash of the checked out code
env is the various system information where this app is running env is the various system information where this app is running
""" """
ra_git_version = ( try:
subprocess.run( ra_git_version = (
["git", "rev-parse", "HEAD"], subprocess.run(
capture_output=True, ["git", "rev-parse", "HEAD"],
check=True, capture_output=True,
) check=True,
.stdout.decode("utf-8") )
.strip() .stdout.decode("utf-8")
) .strip()
pi_version = ( )
subprocess.run( except subprocess.CalledProcessError as error:
["uname", "-a"], logging.warning("Executed shell command: %s", " ".join(error.cmd))
capture_output=True, logging.warning("Got error: %s", error.stderr.decode("utf-8"))
check=True, ra_git_version = ""
)
.stdout.decode("utf-8") try:
.strip() pi_version = (
) subprocess.run(
["uname", "-a"],
capture_output=True,
check=True,
)
.stdout.decode("utf-8")
.strip()
)
except subprocess.CalledProcessError as error:
logging.warning("Executed shell command: %s", " ".join(error.cmd))
logging.warning("Got error: %s", error.stderr.decode("utf-8"))
pi_version = "Unknown"
return {"git": ra_git_version, "env": pi_version} return {"git": ra_git_version, "env": pi_version}
@ -70,28 +82,46 @@ def running_proc(daemon):
Takes (str) daemon Takes (str) daemon
Returns (int) proc, which is the number of processes currently running Returns (int) proc, which is the number of processes currently running
""" """
process = subprocess.run( try:
["ps", "aux"], processes = (
capture_output=True, subprocess.run(
check=True, ["ps", "aux"],
) capture_output=True,
output = process.stdout.decode("utf-8") check=True,
)
.stdout.decode("utf-8")
.strip()
)
except subprocess.CalledProcessError as error:
logging.warning("Executed shell command: %s", " ".join(error.cmd))
logging.warning("Got error: %s", error.stderr.decode("utf-8"))
processes = ""
from re import findall from re import findall
proc = findall(daemon, output) matching_processes = findall(daemon, processes)
return len(proc) return len(matching_processes)
def is_bridge_setup(): def is_bridge_setup():
""" """
Returns (bool) True if the rascsi_bridge network interface exists Returns (bool) True if the rascsi_bridge network interface exists
""" """
process = subprocess.run( try:
["brctl", "show"], bridges = (
capture_output=True, subprocess.run(
check=True, ["brctl", "show"],
) capture_output=True,
output = process.stdout.decode("utf-8") check=True,
if "rascsi_bridge" in output: )
.stdout.decode("utf-8")
.strip()
)
except subprocess.CalledProcessError as error:
logging.warning("Executed shell command: %s", " ".join(error.cmd))
logging.warning("Got error: %s", error.stderr.decode("utf-8"))
bridges = ""
if "rascsi_bridge" in bridges:
return True return True
return False return False