Skip to content

Commit

Permalink
Merge pull request #16 from Paraphraser/20220803-entrypoint-router-main
Browse files Browse the repository at this point in the history
unexpected script termination - entrypoint-router.sh
  • Loading branch information
zyclonite authored Aug 3, 2022
2 parents 4b54630 + 4d0f21c commit 5548308
Showing 1 changed file with 3 additions and 10 deletions.
13 changes: 3 additions & 10 deletions scripts/entrypoint-router.sh
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,8 @@ update_iptables() {
update_iptables "A" "adding"

# define where the ZeroTier daemon will write its output (if any)
TAIL_PIPE=$(mktemp /tmp/zerotier-ipc-XXXXXX)
TAIL_PIPE="/tmp/zerotier-ipc-log"
cat /dev/null >"${TAIL_PIPE}"

# start listening and echoing anything that appears there into this process
tail -f "${TAIL_PIPE}" &
Expand All @@ -125,20 +126,12 @@ termination_handler() {
update_iptables "D" "removing"

# relay the termination message to the daemon
# (the pipe listener is cleaned up automatically)
if [ -d "/proc/${ZEROTIER_DAEMON_PID}" ] ; then
kill -TERM ${ZEROTIER_DAEMON_PID}
wait ${ZEROTIER_DAEMON_PID}
fi

# tell the pipe listener to go away too
if [ -d "/proc/${TAIL_PIPE_PID}" ] ; then
kill -TERM ${TAIL_PIPE_PID}
wait ${TAIL_PIPE_PID}
fi

# clean up the pipe file
rm "${TAIL_PIPE}"

}

# set up termination handler (usually catches TERM)
Expand Down

0 comments on commit 5548308

Please sign in to comment.