[Xymon-developer] SF.net SVN: xymon:[6749] trunk/web

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

Revision: 6749
          http://xymon.svn.sourceforge.net/xymon/?rev=6749&view=rev
Author:   storner
Date:     2011-09-04 17:26:31 +0000 (Sun, 04 Sep 2011)
Log Message:
-----------
svcstatus, datepage, reportlog cgi's: Use load_hostinfo() to pick up hosts.cfg for just a single host.

Modified Paths:
--------------
    trunk/web/datepage.c
    trunk/web/reportlog.c
    trunk/web/svcstatus.c

Modified: trunk/web/datepage.c
===================================================================
--- trunk/web/datepage.c	2011-09-04 17:24:36 UTC (rev 6748)
+++ trunk/web/datepage.c	2011-09-04 17:26:31 UTC (rev 6749)
@@ -121,7 +121,7 @@
 			if (cookie && *cookie) {
 				void *hinfo;
 
-				load_hostnames(xgetenv("HOSTSCFG"), NULL, get_fqdn());
+				load_hostinfo(cookie);
 				hinfo = hostinfo(cookie);
 				if (hinfo) {
 					pagepath = xmh_item(hinfo, XMH_PAGEPATH);

Modified: trunk/web/reportlog.c
===================================================================
--- trunk/web/reportlog.c	2011-09-04 17:24:36 UTC (rev 6748)
+++ trunk/web/reportlog.c	2011-09-04 17:26:31 UTC (rev 6749)
@@ -126,7 +126,7 @@
 
 	cgidata = cgi_request();
 	parse_query();
-	load_hostnames(xgetenv("HOSTSCFG"), NULL, get_fqdn());
+	load_hostinfo(hostname);
         if ((hinfo = hostinfo(hostname)) == NULL) {
 		errormsg("No such host");
 		return 1;

Modified: trunk/web/svcstatus.c
===================================================================
--- trunk/web/svcstatus.c	2011-09-04 17:24:36 UTC (rev 6748)
+++ trunk/web/svcstatus.c	2011-09-04 17:26:31 UTC (rev 6749)
@@ -153,14 +153,20 @@
 int loadhostdata(char *hostname, char **ip, char **displayname, char **compacts, int full)
 {
 	void *hinfo = NULL;
+	int loadres;
 
 	if (full) {
-		load_hostnames(xgetenv("HOSTSCFG"), NULL, get_fqdn());
+		loadres = load_hostnames(xgetenv("HOSTSCFG"), NULL, get_fqdn());
 	}
 	else {
-		load_hostinfo(hostname);
+		loadres = load_hostinfo(hostname);
 	}
 
+	if (loadres != 0) {
+		errormsg("Cannot load host configuration");
+		return 1;
+	}
+
 	if ((hinfo = hostinfo(hostname)) == NULL) {
 		errormsg("No such host");
 		return 1;

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