diff --git a/src/apcups.c b/src/apcups.c
index 591f6acd652b092db8a9332acb868d91d5e2f08a..af5f24c70f2f2d1e5544a7a1c62cd7f880b27ba4 100644 (file)
--- a/src/apcups.c
+++ b/src/apcups.c
**/
#include "collectd.h"
+
#include "common.h" /* rrd_update_file */
#include "plugin.h" /* plugin_register, plugin_submit */
-#include "configfile.h" /* cf_register */
#if HAVE_SYS_TYPES_H
# include <sys/types.h>
# 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
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;
{
int sd;
int status;
- struct addrinfo ai_hints;
struct addrinfo *ai_return;
struct addrinfo *ai_list;
- /* Resolve name */
- memset (&ai_hints, 0, sizeof (ai_hints));
/* TODO: Change this to `AF_UNSPEC' if apcupsd can handle IPv6 */
- ai_hints.ai_family = AF_INET;
- ai_hints.ai_socktype = SOCK_STREAM;
+ struct addrinfo ai_hints = {
+ .ai_family = AF_INET,
+ .ai_socktype = SOCK_STREAM
+ };
status = getaddrinfo (node, service, &ai_hints, &ai_return);
if (status != 0)
static int apcups_config (oconfig_item_t *ci)
{
- int i;
_Bool persistent_conn_set = 0;
- for (i = 0; i < ci->children_num; i++)
+ for (int i = 0; i < ci->children_num; i++)
{
oconfig_item_t *child = ci->children + i;
if (!persistent_conn_set) {
double interval = CDTIME_T_TO_DOUBLE(plugin_get_interval());
- if (interval > 15.0) {
+ if (interval > APCUPS_SERVER_TIMEOUT) {
NOTICE ("apcups plugin: Plugin poll interval set to %.3f seconds. "
- "Apcupsd NIS socket timeout is 15 seconds, "
+ "Apcupsd NIS socket timeout is %.3f seconds, "
"PersistentConnection disabled by default.",
- interval);
+ interval, APCUPS_SERVER_TIMEOUT);
conf_persistent_conn = 0;
}
}