feedc0de/coredump-uploader
1
0
Fork 0
forked from getsentry/coredump-uploader
Code Pull Requests Activity

fix: Run "kill" from shell, handle failure to execute.

Browse Source 
Some systems/containers have kill as a shell built-in.
This commit is contained in:
Floris Bruynooghe
2021-04-22 13:59:16 +02:00
committed by GitHub
parent 4665f33adf 879ed3b6d6
commit d8a7fd2ef4
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
coredump_uploader/__init__.py
View File

@ -337,11 +337,12 @@ def signal_name_to_signal_number(signal_name):
temp = str( temp = str(
"-l" + re.match(r"SIG(?P<exit_signal>.*)", signal_name).group("exit_signal") "-l" + re.match(r"SIG(?P<exit_signal>.*)", signal_name).group("exit_signal")
) )
exit_signal_number = subprocess.check_output(["kill", temp]) # kill can be a shell builtin, or not even present...
except AttributeError: exit_signal_number = subprocess.check_output(["kill", temp], shell=True)
exit_signal_number = None except (AttributeError, subprocess.CalledProcessError):
return None
return exit_signal_number return int(exit_signal_number)
class CoredumpHandler(RegexMatchingEventHandler): class CoredumpHandler(RegexMatchingEventHandler):
@ -572,7 +573,7 @@ class CoredumpUploader(object):
"synthetic": True, "synthetic": True,
"meta": { "meta": {
"signal": { "signal": {
"number": int(exit_signal_number), "number": exit_signal_number,
"code": None, "code": None,
"name": exit_signal, "name": exit_signal,
}, },