Mirrors/rffmpeg
1
0
Fork 0
mirror of https://github.com/joshuaboniface/rffmpeg.git synced 2026-01-23 02:24:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Wrap command runs in a finally block

Browse source 
Ensures that cleanup happens even if something else weird happens, which
tends to happen to my systems a lot leaving stuck processes.
This commit is contained in:
Joshua M. Boniface 2024-07-05 18:18:35 -04:00
parent 13afb01b3a
commit 16ddb2bdee
1 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

30
rffmpeg
View file

@ -557,19 +557,23 @@ def run_ffmpeg(config, ffmpeg_args):
target_hid, target_hostname, target_servername = get_target_host(config)
if not target_hostname or target_hostname == "localhost":
ret = run_local_ffmpeg(config, target_hid, ffmpeg_args)
else:
ret = run_remote_ffmpeg(
config, target_hid, target_hostname, target_servername, ffmpeg_args
)
cleanup()
if ret.returncode == 0:
log.info(f"Finished rffmpeg with return code {ret.returncode}")
else:
log.error(f"Finished rffmpeg with return code {ret.returncode}")
exit(ret.returncode)
try:
returncode = 200
if not target_hostname or target_hostname == "localhost":
ret = run_local_ffmpeg(config, ffmpeg_args)
returncode = ret.returncode
else:
ret = run_remote_ffmpeg(
config, target_hid, target_hostname, target_servername, ffmpeg_args
)
returncode = ret.returncode
finally:
cleanup()
if returncode == 0:
log.info(f"Finished rffmpeg with return code {ret.returncode}")
else:
log.error(f"Finished rffmpeg with return code {ret.returncode}")
exit(returncode)
def run_control(config):