From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 4 May 2009 20:05:18 +0000 (+0000)
Subject: luci-0.8: Merge r4470
X-Git-Tag: 0.8.7~51
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=96c4451b1a6bfb704fe633ac0d5bf594199ea25d;p=oweals%2Fluci.git

luci-0.8: Merge r4470
---

diff --git a/contrib/package/freifunk-watchdog/src/watchdog.c b/contrib/package/freifunk-watchdog/src/watchdog.c
index 12d4badec..b431b6dae 100644
--- a/contrib/package/freifunk-watchdog/src/watchdog.c
+++ b/contrib/package/freifunk-watchdog/src/watchdog.c
@@ -318,16 +318,18 @@ static int do_daemon(void)
 
 
 		/* Wifi restart required? */
-		if( restart_wifi > 0 )
+		if( restart_wifi >= HYSTERESIS )
 		{
 			restart_wifi = 0;
+			syslog(LOG_WARNING, "Restarting wireless");
 			EXEC(WIFI_ACTION);
 		}
 
 		/* Cron restart required? */
-		if( restart_cron > 0 )
+		if( restart_cron >= HYSTERESIS )
 		{
 			restart_cron = 0;
+			syslog(LOG_WARNING, "Restarting crond process");
 			EXEC(CRON_ACTION);	
 		}
 
diff --git a/contrib/package/freifunk-watchdog/src/watchdog.h b/contrib/package/freifunk-watchdog/src/watchdog.h
index d11396f80..7de24210a 100644
--- a/contrib/package/freifunk-watchdog/src/watchdog.h
+++ b/contrib/package/freifunk-watchdog/src/watchdog.h
@@ -39,6 +39,9 @@
 /* Check interval */
 #define INTERVAL		30
 
+/* Hysteresis */
+#define HYSTERESIS		3
+
 /* How to call myself in the logs */
 #define SYSLOG_IDENT	"Freifunk Watchdog"