projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-5.5' into collectd-5.6
[collectd.git]
/
src
/
apcups.c
diff --git
a/src/apcups.c
b/src/apcups.c
index
591f6ac
..
af5f24c
100644
(file)
--- a/
src/apcups.c
+++ b/
src/apcups.c
@@
-25,9
+25,9
@@
**/
#include "collectd.h"
**/
#include "collectd.h"
+
#include "common.h" /* rrd_update_file */
#include "plugin.h" /* plugin_register, plugin_submit */
#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>
#if HAVE_SYS_TYPES_H
# include <sys/types.h>
@@
-40,6
+40,10
@@
# include <netinet/in.h>
#endif
# 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
#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);
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;
close (*fd);
*fd = -1;
@@
-111,15
+115,14
@@
static int net_open (char const *node, char const *service)
{
int sd;
int status;
{
int sd;
int status;
- struct addrinfo ai_hints;
struct addrinfo *ai_return;
struct addrinfo *ai_list;
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 */
/* 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)
status = getaddrinfo (node, service, &ai_hints, &ai_return);
if (status != 0)
@@
-377,10
+380,9
@@
static int apc_query_server (char const *node, char const *service,
static int apcups_config (oconfig_item_t *ci)
{
static int apcups_config (oconfig_item_t *ci)
{
- int i;
_Bool persistent_conn_set = 0;
_Bool persistent_conn_set = 0;
- for (i = 0; i < ci->children_num; i++)
+ for (i
nt i
= 0; i < ci->children_num; i++)
{
oconfig_item_t *child = ci->children + i;
{
oconfig_item_t *child = ci->children + i;
@@
-400,11
+402,11
@@
static int apcups_config (oconfig_item_t *ci)
if (!persistent_conn_set) {
double interval = CDTIME_T_TO_DOUBLE(plugin_get_interval());
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. "
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.",
"PersistentConnection disabled by default.",
- interval);
+ interval
, APCUPS_SERVER_TIMEOUT
);
conf_persistent_conn = 0;
}
}
conf_persistent_conn = 0;
}
}