X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fapcups.c;h=9f7476bfa929940bf4bf882bfc01da764b476633;hb=73a6f82a63747f088352a61e201beac2d185b2ac;hp=8006bd1edac61ad8c5f14a53c87102cdd6650d2f;hpb=309145fa75386a73bf1584a93e81450368f8569e;p=collectd.git

diff --git a/src/apcups.c b/src/apcups.c
index 8006bd1e..9f7476bf 100644
--- a/src/apcups.c
+++ b/src/apcups.c
@@ -40,6 +40,10 @@
 # include <netinet/in.h>
 #endif
 
+#ifndef APCUPS_SERVER_TIMEOUT
+# define APCUPS_SERVER_TIMEOUT 15.0
+#endif
+
 #ifndef APCUPS_DEFAULT_NODE
 # define APCUPS_DEFAULT_NODE "localhost"
 #endif
@@ -85,7 +89,7 @@ static int net_shutdown (int *fd)
 	if ((fd == NULL) || (*fd < 0))
 		return (EINVAL);
 
-	swrite (*fd, (void *) &packet_size, sizeof (packet_size));
+	(void)swrite (*fd, (void *) &packet_size, sizeof (packet_size));
 	close (*fd);
 	*fd = -1;
 
@@ -378,6 +382,7 @@ static int apc_query_server (char const *node, char const *service,
 static int apcups_config (oconfig_item_t *ci)
 {
 	int i;
+	_Bool persistent_conn_set = 0;
 
 	for (i = 0; i < ci->children_num; i++)
 	{
@@ -389,12 +394,25 @@ static int apcups_config (oconfig_item_t *ci)
 			cf_util_get_service (child, &conf_service);
 		else if (strcasecmp (child->key, "ReportSeconds") == 0)
 			cf_util_get_boolean (child, &conf_report_seconds);
-		else if (strcasecmp (child->key, "PersistentConnection") == 0)
+		else if (strcasecmp (child->key, "PersistentConnection") == 0) {
 			cf_util_get_boolean (child, &conf_persistent_conn);
+			persistent_conn_set = 1;
+		}
 		else
 			ERROR ("apcups plugin: Unknown config option \"%s\".", child->key);
 	}
 
+	if (!persistent_conn_set) {
+		double interval = CDTIME_T_TO_DOUBLE(plugin_get_interval());
+		if (interval > APCUPS_SERVER_TIMEOUT) {
+			NOTICE ("apcups plugin: Plugin poll interval set to %.3f seconds. "
+				"Apcupsd NIS socket timeout is %.3f seconds, "
+				"PersistentConnection disabled by default.",
+				interval, APCUPS_SERVER_TIMEOUT);
+			conf_persistent_conn = 0;
+		}
+	}
+
 	return (0);
 } /* int apcups_config */