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.3' into collectd-5.4
[collectd.git]
/
src
/
write_graphite.c
diff --git
a/src/write_graphite.c
b/src/write_graphite.c
index
c264932
..
504ea9d
100644
(file)
--- a/
src/write_graphite.c
+++ b/
src/write_graphite.c
@@
-67,7
+67,7
@@
#endif
#ifndef WG_DEFAULT_PROTOCOL
#endif
#ifndef WG_DEFAULT_PROTOCOL
-# define WG_DEFAULT_PROTOCOL "
ud
p"
+# define WG_DEFAULT_PROTOCOL "
tc
p"
#endif
#ifndef WG_DEFAULT_LOG_SEND_ERRORS
#endif
#ifndef WG_DEFAULT_LOG_SEND_ERRORS
@@
-128,13
+128,17
@@
static int wg_send_buffer (struct wg_callback *cb)
ssize_t status = 0;
status = swrite (cb->sock_fd, cb->send_buf, strlen (cb->send_buf));
ssize_t status = 0;
status = swrite (cb->sock_fd, cb->send_buf, strlen (cb->send_buf));
- if (
cb->log_send_errors &&
status < 0)
+ if (status < 0)
{
{
- char errbuf[1024];
- ERROR ("write_graphite plugin: send to %s:%s (%s) failed with status %zi (%s)",
- cb->node, cb->service, cb->protocol,
- status, sstrerror (errno, errbuf, sizeof (errbuf)));
+ const char *protocol = cb->protocol ? cb->protocol : WG_DEFAULT_PROTOCOL;
+ if (cb->log_send_errors)
+ {
+ char errbuf[1024];
+ ERROR ("write_graphite plugin: send to %s:%s (%s) failed with status %zi (%s)",
+ cb->node, cb->service, protocol,
+ status, sstrerror (errno, errbuf, sizeof (errbuf)));
+ }
close (cb->sock_fd);
cb->sock_fd = -1;
close (cb->sock_fd);
cb->sock_fd = -1;
@@
-188,6
+192,8
@@
static int wg_callback_init (struct wg_callback *cb)
const char *service = cb->service ? cb->service : WG_DEFAULT_SERVICE;
const char *protocol = cb->protocol ? cb->protocol : WG_DEFAULT_PROTOCOL;
const char *service = cb->service ? cb->service : WG_DEFAULT_SERVICE;
const char *protocol = cb->protocol ? cb->protocol : WG_DEFAULT_PROTOCOL;
+ char connerr[1024] = "";
+
if (cb->sock_fd > 0)
return (0);
if (cb->sock_fd > 0)
return (0);
@@
-199,14
+205,8
@@
static int wg_callback_init (struct wg_callback *cb)
if (0 == strcasecmp ("tcp", protocol))
ai_hints.ai_socktype = SOCK_STREAM;
if (0 == strcasecmp ("tcp", protocol))
ai_hints.ai_socktype = SOCK_STREAM;
- else if (0 == strcasecmp ("udp", protocol))
- ai_hints.ai_socktype = SOCK_DGRAM;
else
else
- {
- ERROR ("write_graphite plugin: unknown protocol (%s)",
- protocol);
- return (-1);
- }
+ ai_hints.ai_socktype = SOCK_DGRAM;
ai_list = NULL;
ai_list = NULL;
@@
-223,12
+223,19
@@
static int wg_callback_init (struct wg_callback *cb)
{
cb->sock_fd = socket (ai_ptr->ai_family, ai_ptr->ai_socktype,
ai_ptr->ai_protocol);
{
cb->sock_fd = socket (ai_ptr->ai_family, ai_ptr->ai_socktype,
ai_ptr->ai_protocol);
- if (cb->sock_fd < 0)
+ if (cb->sock_fd < 0) {
+ char errbuf[1024];
+ snprintf (connerr, sizeof (connerr), "failed to open socket: %s",
+ sstrerror (errno, errbuf, sizeof (errbuf)));
continue;
continue;
+ }
status = connect (cb->sock_fd, ai_ptr->ai_addr, ai_ptr->ai_addrlen);
if (status != 0)
{
status = connect (cb->sock_fd, ai_ptr->ai_addr, ai_ptr->ai_addrlen);
if (status != 0)
{
+ char errbuf[1024];
+ snprintf (connerr, sizeof (connerr), "failed to connect to remote "
+ "host: %s", sstrerror (errno, errbuf, sizeof (errbuf)));
close (cb->sock_fd);
cb->sock_fd = -1;
continue;
close (cb->sock_fd);
cb->sock_fd = -1;
continue;
@@
-241,12
+248,12
@@
static int wg_callback_init (struct wg_callback *cb)
if (cb->sock_fd < 0)
{
if (cb->sock_fd < 0)
{
- char errbuf[1024];
+ if (connerr[0] == '\0')
+ /* this should not happen but try to get a message anyway */
+ sstrerror (errno, connerr, sizeof (connerr));
c_complain (LOG_ERR, &cb->init_complaint,
c_complain (LOG_ERR, &cb->init_complaint,
- "write_graphite plugin: Connecting to %s:%s via %s failed. "
- "The last error was: %s", node, service, protocol,
- sstrerror (errno, errbuf, sizeof (errbuf)));
- close (cb->sock_fd);
+ "write_graphite plugin: Connecting to %s:%s via %s failed. "
+ "The last error was: %s", node, service, protocol, connerr);
return (-1);
}
else
return (-1);
}
else
@@
-274,8
+281,11
@@
static void wg_callback_free (void *data)
wg_flush_nolock (/* timeout = */ 0, cb);
wg_flush_nolock (/* timeout = */ 0, cb);
- close(cb->sock_fd);
- cb->sock_fd = -1;
+ if (cb->sock_fd >= 0)
+ {
+ close (cb->sock_fd);
+ cb->sock_fd = -1;
+ }
sfree(cb->name);
sfree(cb->node);
sfree(cb->name);
sfree(cb->node);
@@
-393,12
+403,9
@@
static int wg_write_messages (const data_set_t *ds, const value_list_t *vl,
return (status);
/* Send the message to graphite */
return (status);
/* Send the message to graphite */
- wg_send_message (buffer, cb);
- if (status != 0)
- {
- /* An error message has already been printed. */
+ status = wg_send_message (buffer, cb);
+ if (status != 0) /* error message has been printed already. */
return (status);
return (status);
- }
return (0);
} /* int wg_write_messages */
return (0);
} /* int wg_write_messages */
@@
-499,7
+506,17
@@
static int wg_config_node (oconfig_item_t *ci)
else if (strcasecmp ("Port", child->key) == 0)
cf_util_get_service (child, &cb->service);
else if (strcasecmp ("Protocol", child->key) == 0)
else if (strcasecmp ("Port", child->key) == 0)
cf_util_get_service (child, &cb->service);
else if (strcasecmp ("Protocol", child->key) == 0)
+ {
cf_util_get_string (child, &cb->protocol);
cf_util_get_string (child, &cb->protocol);
+
+ if (strcasecmp ("UDP", cb->protocol) != 0 &&
+ strcasecmp ("TCP", cb->protocol) != 0)
+ {
+ ERROR ("write_graphite plugin: Unknown protocol (%s)",
+ cb->protocol);
+ status = -1;
+ }
+ }
else if (strcasecmp ("LogSendErrors", child->key) == 0)
cf_util_get_boolean (child, &cb->log_send_errors);
else if (strcasecmp ("Prefix", child->key) == 0)
else if (strcasecmp ("LogSendErrors", child->key) == 0)
cf_util_get_boolean (child, &cb->log_send_errors);
else if (strcasecmp ("Prefix", child->key) == 0)