From b9a864f1c4cc90332ea8468a153defae9ee43040 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Thu, 2 Aug 2012 23:47:13 -0700 Subject: [PATCH] Be more hardcore when trying to restart the proxy. --- .../extra/usr/scripts/start-dnscrypt-proxy.sh | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/start-dnscrypt-proxy.sh b/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/start-dnscrypt-proxy.sh index 93f6f44..3c345a2 100755 --- a/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/start-dnscrypt-proxy.sh +++ b/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/start-dnscrypt-proxy.sh @@ -107,7 +107,18 @@ done [ x"$best_file" = "x" ] && exit 1 best_args=$(cat "${RES_DIR}/${best_file}") dnscrypt-proxy $best_args --local-address="${INTERFACE_PROXY}" \ - --pidfile="$PROXY_PID_FILE" --daemonize || exit 1 + --pidfile="$PROXY_PID_FILE" --daemonize +if [ $? != 0 ]; then + [ -r "$PROXY_PID_FILE" ] && kill $(cat -- "$PROXY_PID_FILE") + sleep 1 + killall dnscrypt-proxy + sleep 1 + rm -f "$PROXY_PID_FILE" + killall -9 dnscrypt-proxy + sleep 1 + dnscrypt-proxy $best_args --local-address="${INTERFACE_PROXY}" \ + --pidfile="$PROXY_PID_FILE" --daemonize || exit 1 +fi i=0 while [ $i -lt 30 ]; do