administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-02-04 10:15:22 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Add timeout to go2rtc healthcheck

Browse Source
This commit is contained in:
Felipe Santos 2023-02-19 13:53:41 -03:00
parent 4d8821c2d7
commit 47a1e9fc90
4 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docker/rootfs/etc/s6-overlay/s6-rc.d/frigate/finish
View File

@ -11,20 +11,16 @@ readonly exit_code_service="${1}"
readonly exit_code_signal="${2}" readonly exit_code_signal="${2}"
readonly service="Frigate" readonly service="Frigate"
echo "Service ${service} exited with code ${exit_code_service} (by signal ${exit_code_signal})" >&2 echo "[INFO] Service ${service} exited with code ${exit_code_service} (by signal ${exit_code_signal})" >&2
if [[ "${exit_code_service}" -eq 256 ]]; then if [[ "${exit_code_service}" -eq 256 ]]; then
if [[ "${exit_code_container}" -eq 0 ]]; then if [[ "${exit_code_container}" -eq 0 ]]; then
echo $((128 + exit_code_signal)) > /run/s6-linux-init-container-results/exitcode echo $((128 + exit_code_signal)) >/run/s6-linux-init-container-results/exitcode
fi fi
elif [[ "${exit_code_service}" -ne 0 ]]; then elif [[ "${exit_code_service}" -ne 0 ]]; then
if [[ "${exit_code_container}" -eq 0 ]]; then if [[ "${exit_code_container}" -eq 0 ]]; then
echo "${exit_code_service}" > /run/s6-linux-init-container-results/exitcode echo "${exit_code_service}" >/run/s6-linux-init-container-results/exitcode
fi fi
else
# Exit code 0 is expected when Frigate is restarted by the user. In this case,
# we create a signal for the go2rtc finish script to tolerate the restart.
touch /dev/shm/restarting-frigate
fi fi
exec /run/s6/basedir/bin/halt exec /run/s6/basedir/bin/halt

2
docker/rootfs/etc/s6-overlay/s6-rc.d/go2rtc-healthcheck/run
View File

@ -8,7 +8,7 @@ echo "[INFO] Starting go2rtc healthcheck service..." >&2
while sleep 1m; do while sleep 1m; do
# Check if the service is running # Check if the service is running
if ! curl -fsSL http://127.0.0.1:1984/api/streams >/dev/null; then if ! timeout 10s curl -fsSL http://127.0.0.1:1984/api/streams >/dev/null; then
echo "[ERROR] The go2rtc is not responding to ping, restarting it..." >&2 echo "[ERROR] The go2rtc is not responding to ping, restarting it..." >&2
# We can also use -r instead of -t to send kill signal rather than term # We can also use -r instead of -t to send kill signal rather than term
s6-svc -t /var/run/service/go2rtc s6-svc -t /var/run/service/go2rtc

1
docker/rootfs/etc/s6-overlay/s6-rc.d/go2rtc-healthcheck/timeout-kill Normal file
View File

@ -0,0 +1 @@
5000

6
docker/rootfs/etc/s6-overlay/s6-rc.d/nginx/finish
View File

@ -11,18 +11,18 @@ readonly exit_code_service="${1}"
readonly exit_code_signal="${2}" readonly exit_code_signal="${2}"
readonly service="NGINX" readonly service="NGINX"
echo "Service ${service} exited with code ${exit_code_service} (by signal ${exit_code_signal})" >&2 echo "[INFO] Service ${service} exited with code ${exit_code_service} (by signal ${exit_code_signal})" >&2
if [[ "${exit_code_service}" -eq 256 ]]; then if [[ "${exit_code_service}" -eq 256 ]]; then
if [[ "${exit_code_container}" -eq 0 ]]; then if [[ "${exit_code_container}" -eq 0 ]]; then
echo $((128 + exit_code_signal)) > /run/s6-linux-init-container-results/exitcode echo $((128 + exit_code_signal)) >/run/s6-linux-init-container-results/exitcode
fi fi
if [[ "${exit_code_signal}" -eq 15 ]]; then if [[ "${exit_code_signal}" -eq 15 ]]; then
exec /run/s6/basedir/bin/halt exec /run/s6/basedir/bin/halt
fi fi
elif [[ "${exit_code_service}" -ne 0 ]]; then elif [[ "${exit_code_service}" -ne 0 ]]; then
if [[ "${exit_code_container}" -eq 0 ]]; then if [[ "${exit_code_container}" -eq 0 ]]; then
echo "${exit_code_service}" > /run/s6-linux-init-container-results/exitcode echo "${exit_code_service}" >/run/s6-linux-init-container-results/exitcode
fi fi
exec /run/s6/basedir/bin/halt exec /run/s6/basedir/bin/halt
fi fi