From fefe847525c824edc0cc9a67b178c641afd923f8 Mon Sep 17 00:00:00 2001 From: CyrusFox Date: Sun, 7 Feb 2016 19:58:52 +0100 Subject: [PATCH] Added new neighbor check to tunneldigger-watchdog --- .../files/usr/bin/tunneldigger-watchdog | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/package/gluon-tunneldigger-watchdog/files/usr/bin/tunneldigger-watchdog b/package/gluon-tunneldigger-watchdog/files/usr/bin/tunneldigger-watchdog index 18b6fa56..efa2ea9f 100755 --- a/package/gluon-tunneldigger-watchdog/files/usr/bin/tunneldigger-watchdog +++ b/package/gluon-tunneldigger-watchdog/files/usr/bin/tunneldigger-watchdog @@ -1,7 +1,12 @@ #!/bin/sh PIDFILE=/var/run/tunneldigger.mesh-vpn.pid -if [ "$(pgrep tunneldigger)" != "$(cat $PIDFILE)" ] && [ "$(uci get tunneldigger.@broker[0].enabled)" == "1" ]; then - /etc/init.d/tunneldigger restart - logger -t tunneldiger-watchdog "Restarted Tunneldigger" +if [ "$(uci get tunneldigger.@broker[0].enabled)" == "1" ]; then + if [ "$(pgrep tunneldigger)" != "$(cat $PIDFILE)" ]; then + /etc/init.d/tunneldigger restart + logger -t tunneldiger-watchdog "Daemon not running, restarted tunneldigger." + elif [ "$(batctl o |grep mesh-vpn |wc -l)" == "0" ]; then + /etc/init.d/tunneldigger restart + logger -t tunneldiger-watchdog "No neighbours on mesh-vpn interface, restarted tunneldigger." + fi fi