48k.eu-mirror
/
ogclient
mirror of https://git.48k.eu/ogclient
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

live: disable browser operations if the binary is missing 

Add shutils.which checks before every browser operations to
skip the subprocess call if the binary is missing.
master
Alejandro Sirgo Rica 2024-09-27 14:01:38 +02:00
parent 8754c21694
commit 9c2ae873f2
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ogclient
View File

@ -13,6 +13,7 @@ import logging
import argparse import argparse
import platform import platform
import subprocess import subprocess
import shutil
try: try:
from signal import SIG_DFL, SIGPIPE from signal import SIG_DFL, SIGPIPE
except ImportError: except ImportError:
@ -79,7 +80,8 @@ def main():
LOGLEVEL = CONFIG['opengnsys']['log'] LOGLEVEL = CONFIG['opengnsys']['log']
if MODE == 'live': if MODE == 'live':
proc = subprocess.Popen(["browser", "-qws", URL]) if shutil.which('browser'):
proc = subprocess.Popen(["browser", "-qws", URL])
if MODE != 'windows': if MODE != 'windows':
signal.signal(SIGPIPE, SIG_DFL) signal.signal(SIGPIPE, SIG_DFL)

5
src/live/ogOperations.py
View File

@ -48,6 +48,9 @@ class OgLiveOperations:
self._smb_pass = config['samba']['pass'] self._smb_pass = config['samba']['pass']
def _restartBrowser(self, url): def _restartBrowser(self, url):
if not shutil.which('browser'):
return
try: try:
proc = subprocess.call(["pkill", "-9", "browser"]) proc = subprocess.call(["pkill", "-9", "browser"])
proc = subprocess.Popen(["browser", "-qws", url]) proc = subprocess.Popen(["browser", "-qws", url])
@ -353,7 +356,7 @@ class OgLiveOperations:
umount_cache() umount_cache()
if subprocess.run(cmd_ethtool).returncode != 0: if subprocess.run(cmd_ethtool).returncode != 0:
logging.error('Error running ethtool subprocess') logging.error('Error running ethtool subprocess')
if subprocess.run(cmd_browser).returncode != 0: if shutil.which('browser') and subprocess.run(cmd_browser).returncode != 0:
logging.error('Error terminating ogBrowser process') logging.error('Error terminating ogBrowser process')
if subprocess.run(cmd_busybox) != 0: if subprocess.run(cmd_busybox) != 0:
logging.error('Error running "busybox poweroff" subprocess') logging.error('Error running "busybox poweroff" subprocess')