[Xymon-developer] SF.net SVN: xymon:[6763] trunk/xymond/xymond.c

[<st...@us...>]

Revision: 6763
          http://xymon.svn.sourceforge.net/xymon/?rev=6763&view=rev
Author:   storner
Date:     2011-09-23 05:52:32 +0000 (Fri, 23 Sep 2011)
Log Message:
-----------
xymond: Fix ackinfo updates being cleared by a DOWNTIME period

Modified Paths:
--------------
    trunk/xymond/xymond.c

Modified: trunk/xymond/xymond.c
===================================================================
--- trunk/xymond/xymond.c	2011-09-23 05:51:07 UTC (rev 6762)
+++ trunk/xymond/xymond.c	2011-09-23 05:52:32 UTC (rev 6763)
@@ -1486,9 +1486,11 @@
 		ackinfo_t *awalk;
 
 		if ((oldalertstatus != A_OK) && (newalertstatus == A_OK)) {
-			/* The status recovered. Set the "clearack" timer */
-			time_t cleartime = now + ACKCLEARDELAY;
-			for (awalk = log->acklist; (awalk); awalk = awalk->next) awalk->cleartime = cleartime;
+			/* The status recovered. Set the "clearack" timer, unless it is just because we are in a DOWNTIME period */
+			if (!log->downtimeactive) {
+				time_t cleartime = now + ACKCLEARDELAY;
+				for (awalk = log->acklist; (awalk); awalk = awalk->next) awalk->cleartime = cleartime;
+			}
 		}
 		else if ((oldalertstatus == A_OK) && (newalertstatus != A_OK)) {
 			/* The status went into a failure-mode. Any acks are revived */

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.