X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fwrite_graphite.c;h=41451a8cee8f8d0bab4dda5d81361b3efd30a229;hb=8a4a61985b6b7e5e507843805cf4b5e965d9f5ed;hp=c264932f5e52ec71a4083fdfdf3be3b2652af074;hpb=dbf45dbf4eab1d058c49fc3bfb8be3e2cba98234;p=collectd.git diff --git a/src/write_graphite.c b/src/write_graphite.c index c264932f..41451a8c 100644 --- a/src/write_graphite.c +++ b/src/write_graphite.c @@ -49,7 +49,6 @@ #include "utils_cache.h" #include "utils_complain.h" -#include "utils_parse_option.h" #include "utils_format_graphite.h" /* Folks without pthread will need to disable this plugin. */ @@ -67,7 +66,7 @@ #endif #ifndef WG_DEFAULT_PROTOCOL -# define WG_DEFAULT_PROTOCOL "udp" +# define WG_DEFAULT_PROTOCOL "tcp" #endif #ifndef WG_DEFAULT_LOG_SEND_ERRORS @@ -83,6 +82,10 @@ # define WG_SEND_BUF_SIZE 1428 #endif +#ifndef WG_MIN_RECONNECT_INTERVAL +# define WG_MIN_RECONNECT_INTERVAL TIME_T_TO_CDTIME_T (1) +#endif + /* * Private variables */ @@ -109,6 +112,7 @@ struct wg_callback pthread_mutex_t send_lock; c_complain_t init_complaint; + cdtime_t last_connect_time; }; @@ -128,13 +132,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)); - 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; @@ -182,15 +190,25 @@ static int wg_callback_init (struct wg_callback *cb) struct addrinfo ai_hints; struct addrinfo *ai_list; struct addrinfo *ai_ptr; + cdtime_t now; int status; const char *node = cb->node ? cb->node : WG_DEFAULT_NODE; 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); + /* Don't try to reconnect too often. By default, one reconnection attempt + * is made per second. */ + now = cdtime (); + if ((now - cb->last_connect_time) < WG_MIN_RECONNECT_INTERVAL) + return (EAGAIN); + cb->last_connect_time = now; + memset (&ai_hints, 0, sizeof (ai_hints)); #ifdef AI_ADDRCONFIG ai_hints.ai_flags |= AI_ADDRCONFIG; @@ -199,14 +217,8 @@ static int wg_callback_init (struct wg_callback *cb) if (0 == strcasecmp ("tcp", protocol)) ai_hints.ai_socktype = SOCK_STREAM; - else if (0 == strcasecmp ("udp", protocol)) - ai_hints.ai_socktype = SOCK_DGRAM; else - { - ERROR ("write_graphite plugin: unknown protocol (%s)", - protocol); - return (-1); - } + ai_hints.ai_socktype = SOCK_DGRAM; ai_list = NULL; @@ -223,12 +235,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); - 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; + } 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; @@ -241,12 +260,12 @@ static int wg_callback_init (struct wg_callback *cb) 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, - "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 @@ -274,8 +293,11 @@ static void wg_callback_free (void *data) 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); @@ -393,12 +415,9 @@ static int wg_write_messages (const data_set_t *ds, const value_list_t *vl, 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 (0); } /* int wg_write_messages */ @@ -499,7 +518,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) + { 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)