2Shirt/WizardKit
2Shirt/WizardKit
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases 26 Packages Wiki Activity Actions

Catch and log missing commands

Browse source 
It's better to be explicit in what's going wrong in the case of
a missing command or program.
This commit is contained in:
2Shirt 2021-06-23 21:33:27 -06:00
parent 3cf371177c
commit d76dca8fd7
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
1 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
scripts/wk/exe.py
View file

@ -51,6 +51,7 @@ class NonBlockingStreamReader():
def save_to_file(self, proc, out_path): def save_to_file(self, proc, out_path):
"""Continuously save output to file while proc is running.""" """Continuously save output to file while proc is running."""
LOG.debug('Saving process %s output to %s', proc, out_path)
while proc.poll() is None: while proc.poll() is None:
out = b'' out = b''
out_bytes = b'' out_bytes = b''
@ -70,10 +71,9 @@ def build_cmd_kwargs(cmd, minimized=False, pipe=True, shell=False, **kwargs):
NOTE: If no encoding specified then UTF-8 will be used. NOTE: If no encoding specified then UTF-8 will be used.
""" """
LOG.debug( LOG.debug(
'cmd: %s, minimized: %s, pipe: %s, shell: %s', 'cmd: %s, minimized: %s, pipe: %s, shell: %s, kwargs: %s',
cmd, minimized, pipe, shell, cmd, minimized, pipe, shell, kwargs,
) )
LOG.debug('kwargs: %s', kwargs)
cmd_kwargs = { cmd_kwargs = {
'args': cmd, 'args': cmd,
'shell': shell, 'shell': shell,
@ -118,6 +118,7 @@ def get_json_from_command(cmd, check=True, encoding='utf-8', errors='ignore'):
If the data can't be decoded then either an exception is raised If the data can't be decoded then either an exception is raised
or an empty dict is returned depending on errors. or an empty dict is returned depending on errors.
""" """
LOG.debug('Loading JSON data from cmd: %s', cmd)
json_data = {} json_data = {}
try: try:
@ -187,9 +188,15 @@ def popen_program(cmd, minimized=False, pipe=False, shell=False, **kwargs):
pipe=pipe, pipe=pipe,
shell=shell, shell=shell,
**kwargs) **kwargs)
try:
proc = subprocess.Popen(**cmd_kwargs)
except FileNotFoundError:
LOG.error('Command not found: %s', cmd)
raise
LOG.debug('proc: %s', proc)
# Ready to run program # Done
return subprocess.Popen(**cmd_kwargs) return proc
def run_program(cmd, check=True, pipe=True, shell=False, **kwargs): def run_program(cmd, check=True, pipe=True, shell=False, **kwargs):
@ -206,7 +213,11 @@ def run_program(cmd, check=True, pipe=True, shell=False, **kwargs):
pipe=pipe, pipe=pipe,
shell=shell, shell=shell,
**kwargs) **kwargs)
proc = subprocess.run(**cmd_kwargs) try:
proc = subprocess.run(**cmd_kwargs)
except FileNotFoundError:
LOG.error('Command not found: %s', cmd)
raise
LOG.debug('proc: %s', proc) LOG.debug('proc: %s', proc)
# Done # Done
@ -215,6 +226,10 @@ def run_program(cmd, check=True, pipe=True, shell=False, **kwargs):
def start_thread(function, args=None, daemon=True): def start_thread(function, args=None, daemon=True):
"""Run function as thread in background, returns Thread object.""" """Run function as thread in background, returns Thread object."""
LOG.debug(
'Starting background thread for function: %s, args: %s, daemon: %s',
function, args, daemon,
)
args = args if args else [] args = args if args else []
thread = Thread(target=function, args=args, daemon=daemon) thread = Thread(target=function, args=args, daemon=daemon)
thread.start() thread.start()