X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fwrite_graphite.c;h=f6c73ac80d8f616e698ec26893dbe489834b13e8;hb=96232c0ca167caadc7aeef6c8c54703ee8247888;hp=e49970c3f630dbe3fe17aecfd758417e2cb031de;hpb=4c6303ec6be673df6c9e0964dfc9419c697bf47c;p=collectd.git diff --git a/src/write_graphite.c b/src/write_graphite.c index e49970c3..f6c73ac8 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. */ @@ -58,30 +57,16 @@ #include #include -#ifndef WG_DEFAULT_NODE -# define WG_DEFAULT_NODE "localhost" -#endif - -#ifndef WG_DEFAULT_SERVICE -# define WG_DEFAULT_SERVICE "2003" -#endif - -#ifndef WG_DEFAULT_PROTOCOL -# define WG_DEFAULT_PROTOCOL "udp" -#endif - -#ifndef WG_DEFAULT_LOG_SEND_ERRORS -# define WG_DEFAULT_LOG_SEND_ERRORS 1 -#endif - -#ifndef WG_DEFAULT_ESCAPE -# define WG_DEFAULT_ESCAPE '_' -#endif +#define WG_DEFAULT_NODE "localhost" +#define WG_DEFAULT_SERVICE "2003" +#define WG_DEFAULT_PROTOCOL "tcp" +#define WG_DEFAULT_LOG_SEND_ERRORS 1 +#define WG_DEFAULT_ESCAPE '_' /* Ethernet - (IPv6 + TCP) = 1500 - (40 + 32) = 1428 */ -#ifndef WG_SEND_BUF_SIZE -# define WG_SEND_BUF_SIZE 1428 -#endif +#define WG_SEND_BUF_SIZE 1428 + +#define WG_MIN_RECONNECT_INTERVAL TIME_T_TO_CDTIME_T (1) /* * Private variables @@ -109,6 +94,7 @@ struct wg_callback pthread_mutex_t send_lock; c_complain_t init_complaint; + cdtime_t last_connect_time; }; @@ -130,11 +116,13 @@ static int wg_send_buffer (struct wg_callback *cb) status = swrite (cb->sock_fd, cb->send_buf, strlen (cb->send_buf)); if (status < 0) { + 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, cb->protocol, + cb->node, cb->service, protocol, status, sstrerror (errno, errbuf, sizeof (errbuf))); } @@ -184,15 +172,23 @@ 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; @@ -206,11 +202,11 @@ static int wg_callback_init (struct wg_callback *cb) ai_list = NULL; - status = getaddrinfo (node, service, &ai_hints, &ai_list); + status = getaddrinfo (cb->node, cb->service, &ai_hints, &ai_list); if (status != 0) { ERROR ("write_graphite plugin: getaddrinfo (%s, %s, %s) failed: %s", - node, service, protocol, gai_strerror (status)); + cb->node, cb->service, protocol, gai_strerror (status)); return (-1); } @@ -219,12 +215,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; @@ -237,18 +240,19 @@ 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))); + "write_graphite plugin: Connecting to %s:%s via %s failed. " + "The last error was: %s", cb->node, cb->service, protocol, connerr); return (-1); } else { c_release (LOG_INFO, &cb->init_complaint, "write_graphite plugin: Successfully connected to %s:%s via %s.", - node, service, protocol); + cb->node, cb->service, protocol); } wg_reset_buffer (cb); @@ -462,8 +466,8 @@ static int wg_config_node (oconfig_item_t *ci) memset (cb, 0, sizeof (*cb)); cb->sock_fd = -1; cb->name = NULL; - cb->node = NULL; - cb->service = NULL; + cb->node = strdup (WG_DEFAULT_NODE); + cb->service = strdup (WG_DEFAULT_SERVICE); cb->protocol = NULL; cb->log_send_errors = WG_DEFAULT_LOG_SEND_ERRORS; cb->prefix = NULL; @@ -542,8 +546,8 @@ static int wg_config_node (oconfig_item_t *ci) /* FIXME: Legacy configuration syntax. */ if (cb->name == NULL) ssnprintf (callback_name, sizeof (callback_name), "write_graphite/%s/%s/%s", - cb->node != NULL ? cb->node : WG_DEFAULT_NODE, - cb->service != NULL ? cb->service : WG_DEFAULT_SERVICE, + cb->node, + cb->service, cb->protocol != NULL ? cb->protocol : WG_DEFAULT_PROTOCOL); else ssnprintf (callback_name, sizeof (callback_name), "write_graphite/%s",