[Xymon-developer] SF.net SVN: xymon:[7650] branches/4.x-master

[<jcc...@us...>]

Revision: 7650
          http://sourceforge.net/p/xymon/code/7650
Author:   jccleaver
Date:     2015-05-01 03:55:44 +0000 (Fri, 01 May 2015)
Log Message:
-----------
Display remote status summaries on nongreen page too

Modified Paths:
--------------
    branches/4.x-master/Changes
    branches/4.x-master/RELEASENOTES
    branches/4.x-master/debian/changelog
    branches/4.x-master/xymongen/pagegen.c

Modified: branches/4.x-master/Changes
===================================================================
--- branches/4.x-master/Changes	2015-05-01 03:51:06 UTC (rev 7649)
+++ branches/4.x-master/Changes	2015-05-01 03:55:44 UTC (rev 7650)
@@ -3,7 +3,8 @@
 
 * rev xxyy
 
-* Summaries should be properly displayed again
+* Summaries should be properly displayed again, and will display on the
+  nongreen.html page as well.
 * An icon for green acknowledged states is now included -- ironically, the 
   original icon that the other checkmarks were based off of.
 * The various utilities in cgi-bin and cgi-secure are now hardlinked to 

Modified: branches/4.x-master/RELEASENOTES
===================================================================
--- branches/4.x-master/RELEASENOTES	2015-05-01 03:51:06 UTC (rev 7649)
+++ branches/4.x-master/RELEASENOTES	2015-05-01 03:55:44 UTC (rev 7650)
@@ -12,7 +12,8 @@
 
 Changes for 4.3.20
 ==================
-Remote summaries have been broken for a while but should now display again
+Remote summaries display had been broken for a while but should now be working
+again. Summaries are now also displayed on the nongreen.html page
 
 Documentation for various directives in hosts.cfg(5) has been added
 

Modified: branches/4.x-master/debian/changelog
===================================================================
--- branches/4.x-master/debian/changelog	2015-05-01 03:51:06 UTC (rev 7649)
+++ branches/4.x-master/debian/changelog	2015-05-01 03:55:44 UTC (rev 7650)
@@ -3,7 +3,8 @@
 
    * rev xxxx
 
-   * Summaries should be properly displayed again
+   * Summaries should be properly displayed again, and will display on the
+     nongreen.html page as well.
    * An icon for green acknowledged states is now included -- ironically, the
      original icon that the other checkmarks were based off of.
    * The various utilities in cgi-bin and cgi-secure are now hardlinked to

Modified: branches/4.x-master/xymongen/pagegen.c
===================================================================
--- branches/4.x-master/xymongen/pagegen.c	2015-05-01 03:51:06 UTC (rev 7649)
+++ branches/4.x-master/xymongen/pagegen.c	2015-05-01 03:55:44 UTC (rev 7650)
@@ -1271,6 +1271,9 @@
 		fprintf(output, "%s", xgetenv("XYMONALLOKTEXT"));
 	}
 
+	/* Summaries on nongreenpage as well */
+	do_summaries(dispsums, output);
+
 	if ((snapshot == 0) && (summarytype == PAGE_NONGREEN)) {
 		do_nongreenext(output, "XYMONNONGREENEXT", "mkbb");
 

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