Skip to content

hijack.sh: switch first attempt to stop the logger from -INT to -TERM #382

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

Merged
xiulipan merged 1 commit into from
Sep 23, 2020
Merged

hijack.sh: switch first attempt to stop the logger from -INT to -TERM #382

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
11 changes: 6 additions & 5 deletions case-lib/hijack.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,18 @@ function func_exit_handler()
}

local loggerBin wcLog; loggerBin=$(basename "$SOFLOGGER")
# INT doesn't print any "Killed" message in non-interactive mode
sudo pkill -INT "$loggerBin" || {
# We need this to avoid the confusion of a "Terminated" message
# without context.
dlogi "pkill -TERM $loggerBin"
sudo pkill -TERM "$loggerBin" || {
dloge "sof-logger was already dead"
exit_status=1
}
sleep 1s
if pgrep "$loggerBin"; then
# FIXME: https://github.com/thesofproject/sof/issues/3433
dlogw "$loggerBin resisted pkill -INT, using -KILL"
dloge "$loggerBin resisted pkill -TERM, using -KILL"
sudo pkill -KILL "$loggerBin"
# exit_status=1
exit_status=1
fi
# logfile is set in a different file: lib.sh
# shellcheck disable=SC2154
Expand Down