projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
virt plugin: get domains using virConnectListAllDomains
[collectd.git]
/
src
/
ping.c
diff --git
a/src/ping.c
b/src/ping.c
index
9b5d5ca
..
66a254d
100644
(file)
--- a/
src/ping.c
+++ b/
src/ping.c
@@
-28,7
+28,6
@@
#include "common.h"
#include "plugin.h"
#include "common.h"
#include "plugin.h"
-#include "configfile.h"
#include "utils_complain.h"
#include <netinet/in.h>
#include "utils_complain.h"
#include <netinet/in.h>
@@
-393,7
+392,7
@@
static int start_thread (void) /* {{{ */
ping_thread_loop = 1;
ping_thread_error = 0;
status = plugin_thread_create (&ping_thread_id, /* attr = */ NULL,
ping_thread_loop = 1;
ping_thread_error = 0;
status = plugin_thread_create (&ping_thread_id, /* attr = */ NULL,
- ping_thread, /* arg = */ (void *) 0);
+ ping_thread, /* arg = */ (void *) 0
, "ping"
);
if (status != 0)
{
ping_thread_loop = 0;
if (status != 0)
{
ping_thread_loop = 0;
@@
-452,13
+451,13
@@
static int ping_init (void) /* {{{ */
"Will use a timeout of %gs.", ping_timeout);
}
"Will use a timeout of %gs.", ping_timeout);
}
-#if
def HAVE_SYS_CAPABILITY_H
+#if
defined(HAVE_SYS_CAPABILITY_H) && defined(CAP_NET_RAW)
if (check_capability (CAP_NET_RAW) != 0)
{
if (getuid () == 0)
WARNING ("ping plugin: Running collectd as root, but the CAP_NET_RAW "
"capability is missing. The plugin's read function will probably "
if (check_capability (CAP_NET_RAW) != 0)
{
if (getuid () == 0)
WARNING ("ping plugin: Running collectd as root, but the CAP_NET_RAW "
"capability is missing. The plugin's read function will probably "
- "fail. Is your init system dropping capabilities
?");
+ "fail. Is your init system dropping capabilities?");
else
WARNING ("ping plugin: collectd doesn't have the CAP_NET_RAW capability. "
"If you don't want to run collectd as root, try running \"setcap "
else
WARNING ("ping plugin: collectd doesn't have the CAP_NET_RAW capability. "
"If you don't want to run collectd as root, try running \"setcap "
@@
-616,16
+615,11
@@
static int ping_config (const char *key, const char *value) /* {{{ */
static void submit (const char *host, const char *type, /* {{{ */
gauge_t value)
{
static void submit (const char *host, const char *type, /* {{{ */
gauge_t value)
{
- value_t values[1];
value_list_t vl = VALUE_LIST_INIT;
value_list_t vl = VALUE_LIST_INIT;
- values[0].gauge = value;
-
- vl.values = values;
+ vl.values = &(value_t) { .gauge = value };
vl.values_len = 1;
vl.values_len = 1;
- sstrncpy (vl.host, hostname_g, sizeof (vl.host));
sstrncpy (vl.plugin, "ping", sizeof (vl.plugin));
sstrncpy (vl.plugin, "ping", sizeof (vl.plugin));
- sstrncpy (vl.plugin_instance, "", sizeof (vl.plugin_instance));
sstrncpy (vl.type_instance, host, sizeof (vl.type_instance));
sstrncpy (vl.type, type, sizeof (vl.type));
sstrncpy (vl.type_instance, host, sizeof (vl.type_instance));
sstrncpy (vl.type, type, sizeof (vl.type));