X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fping.c;h=27a65faafc36f23a14118ac61a04353acc48704f;hb=8ea1756522f94af8e0bb7d06c800d94874f13549;hp=6dcd9ec70d653f27dbea56cde12507c168560c54;hpb=2f0dfdda8bc499fdb161c6a5850ec176e75bd4fa;p=collectd.git

diff --git a/src/ping.c b/src/ping.c
index 6dcd9ec7..27a65faa 100644
--- a/src/ping.c
+++ b/src/ping.c
@@ -45,16 +45,6 @@ typedef struct hostlist_s hostlist_t;
 static pingobj_t *pingobj = NULL;
 static hostlist_t *hosts = NULL;
 
-static data_source_t dsrc[1] =
-{
-	{"ping", DS_TYPE_GAUGE, 0, 65535.0},
-};
-
-static data_set_t ds =
-{
-	"ping", 1, dsrc
-};
-
 static const char *config_keys[] =
 {
 	"Host",
@@ -75,14 +65,16 @@ static void add_hosts (void)
 	hl_prev = NULL;
 	while (hl_this != NULL)
 	{
-		DEBUG ("host = %s, wait_left = %i, wait_time = %i, next = %p",
-				hl_this->host, hl_this->wait_left, hl_this->wait_time, (void *) hl_this->next);
+		DEBUG ("ping plugin: host = %s, wait_left = %i, "
+				"wait_time = %i, next = %p",
+				hl_this->host, hl_this->wait_left,
+				hl_this->wait_time, (void *) hl_this->next);
 
 		if (hl_this->wait_left <= 0)
 		{
 			if (ping_host_add (pingobj, hl_this->host) == 0)
 			{
-				DEBUG ("Successfully added host %s", hl_this->host);
+				DEBUG ("ping plugin: Successfully added host %s", hl_this->host);
 				/* Remove the host from the linked list */
 				if (hl_prev != NULL)
 					hl_prev->next = hl_this->next;
@@ -94,6 +86,9 @@ static void add_hosts (void)
 			}
 			else
 			{
+				WARNING ("ping plugin: Failed adding host "
+						"`%s': %s", hl_this->host,
+						ping_get_error (pingobj));
 				hl_this->wait_left = hl_this->wait_time;
 				hl_this->wait_time *= 2;
 				if (hl_this->wait_time > 86400)
@@ -127,8 +122,7 @@ static int ping_config (const char *key, const char *value)
 	{
 		if ((pingobj = ping_construct ()) == NULL)
 		{
-			ERROR ("ping: `ping_construct' failed: %s",
-				       	ping_get_error (pingobj));
+			ERROR ("ping plugin: `ping_construct' failed.");
 			return (1);
 		}
 	}
@@ -204,6 +198,7 @@ static int ping_read (void)
 	char   host[512];
 	double latency;
 	size_t buf_len;
+	int    number_of_hosts;
 
 	if (pingobj == NULL)
 		return (-1);
@@ -213,11 +208,12 @@ static int ping_read (void)
 
 	if (ping_send (pingobj) < 0)
 	{
-		ERROR ("ping: `ping_send' failed: %s",
+		ERROR ("ping plugin: `ping_send' failed: %s",
 				ping_get_error (pingobj));
 		return (-1);
 	}
 
+	number_of_hosts = 0;
 	for (iter = ping_iterator_get (pingobj);
 			iter != NULL;
 			iter = ping_iterator_next (iter))
@@ -225,30 +221,38 @@ static int ping_read (void)
 		buf_len = sizeof (host);
 		if (ping_iterator_get_info (iter, PING_INFO_HOSTNAME,
 					host, &buf_len))
+		{
+			WARNING ("ping plugin: ping_iterator_get_info "
+					"(PING_INFO_HOSTNAME) failed.");
 			continue;
+		}
 
 		buf_len = sizeof (latency);
 		if (ping_iterator_get_info (iter, PING_INFO_LATENCY,
 					&latency, &buf_len))
+		{
+			WARNING ("ping plugin: ping_iterator_get_info (%s, "
+					"PING_INFO_LATENCY) failed.", host);
 			continue;
+		}
 
-		DEBUG ("host = %s, latency = %f", host, latency);
+		DEBUG ("ping plugin: host = %s, latency = %f", host, latency);
 		ping_submit (host, latency);
+		number_of_hosts++;
 	}
 
-	return (0);
+	if ((number_of_hosts == 0) && (getuid () != 0))
+	{
+		ERROR ("ping plugin: All hosts failed. Try starting collectd as root.");
+	}
+
+	return (number_of_hosts == 0 ? -1 : 0);
 } /* int ping_read */
 
-void module_register (modreg_e load)
+void module_register (void)
 {
-	if (load & MR_DATASETS)
-		plugin_register_data_set (&ds);
-
-	if (load & MR_READ)
-	{
-		plugin_register_config ("ping", ping_config,
-				config_keys, config_keys_num);
-		plugin_register_init ("ping", ping_init);
-		plugin_register_read ("ping", ping_read);
-	}
+	plugin_register_config ("ping", ping_config,
+			config_keys, config_keys_num);
+	plugin_register_init ("ping", ping_init);
+	plugin_register_read ("ping", ping_read);
 } /* void module_register */