Skip to content

Improve signal handling and process cleanup in canary-download #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
assisted-by-ai wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −0
Open

Improve signal handling and process cleanup in canary-download #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions usr/libexec/systemcheck/canary-download
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,16 @@ os.environ['TZ'] = 'UTC'
time.tzset()


_signify_process = None

def canary_download_signal_handler(sig, frame):
print("canary_download_signal_handler")
if _signify_process is not None:
try:
_signify_process.kill()
_signify_process.wait()
except OSError:
pass
sys.exit(128 + sig)


Expand Down Expand Up @@ -120,24 +128,29 @@ def main():
# Avoid Popen shell=True.
signify_openbsd_cmd = shlex.split(signify_openbsd_cmd)

global _signify_process

process = subprocess.Popen(
signify_openbsd_cmd,
stdout=PIPE,
stderr=PIPE
)
_signify_process = process

try:
process.wait(timeout_seconds)
except subprocess.TimeoutExpired:
msg = "canary signify-openbsd verification timeout."
print(msg, file=sys.stderr)
process.kill()
process.wait()
sys.exit(6)
except BaseException:
error_message = traceback.format_exc()
msg = "canary signify-openbsd unknown error. Traceback:\n" + error_message
print(msg, file=sys.stderr)
process.kill()
process.wait()
sys.exit(7)

stdout, stderr = process.communicate(timeout=2)
Expand Down