Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 23 Nov 2015 19:52:04 +0000 (UTC)
From:      Mark Felder <feld@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r402323 - in head/net-mgmt/xymon-server: . files
Message-ID:  <201511231952.tANJq4lx097058@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: feld
Date: Mon Nov 23 19:52:04 2015
New Revision: 402323
URL: https://svnweb.freebsd.org/changeset/ports/402323

Log:
  net-mgmt/xymon-server: Patch to fix HTTP monitoring
  
  In 4.2.23 the HTTP status codes were reworked, but a comparison mistake
  caused the "catch-all" for non-standard status codes was incorrect. The
  result is that some valid HTTP status codes may cause Xymon to report
  RED when they should have reported YELLOW or GREEN.

Added:
  head/net-mgmt/xymon-server/files/patch-xymonnet_httpresult.c   (contents, props changed)
Modified:
  head/net-mgmt/xymon-server/Makefile

Modified: head/net-mgmt/xymon-server/Makefile
==============================================================================
--- head/net-mgmt/xymon-server/Makefile	Mon Nov 23 19:51:41 2015	(r402322)
+++ head/net-mgmt/xymon-server/Makefile	Mon Nov 23 19:52:04 2015	(r402323)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xymon
 PORTVERSION=	4.3.23
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	net-mgmt www
 MASTER_SITES=	SF/xymon/Xymon/${PORTVERSION}
 PKGNAMESUFFIX=	-server${PKGNAMESUFFIX2}

Added: head/net-mgmt/xymon-server/files/patch-xymonnet_httpresult.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-mgmt/xymon-server/files/patch-xymonnet_httpresult.c	Mon Nov 23 19:52:04 2015	(r402323)
@@ -0,0 +1,17 @@
+--- xymonnet/httpresult.c.orig	2015-11-23 19:40:49 UTC
++++ xymonnet/httpresult.c
+@@ -64,10 +64,10 @@ static int statuscolor(testedhost_t *h, 
+ 		break;
+ 	  default:
+ 		/* Unknown or custom status */
+-		result = (result < 100) ? (h->dialup ? COL_CLEAR : COL_RED) :
+-			 (result < 200) ? COL_YELLOW :
+-			 (result < 300) ? COL_GREEN  :
+-			 (result < 400) ? COL_YELLOW :
++		result = (status < 100) ? (h->dialup ? COL_CLEAR : COL_RED) :
++			 (status < 200) ? COL_YELLOW :
++			 (status < 300) ? COL_GREEN  :
++			 (status < 400) ? COL_YELLOW :
+ 			 COL_RED;
+ 		break;
+ 	}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511231952.tANJq4lx097058>