X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fwrite_graphite.c;h=41451a8cee8f8d0bab4dda5d81361b3efd30a229;hb=e1812f8e5c5f91328398c66b602d07ee7c6ede51;hp=504ea9d45fa2e55534e1fdc62fec4a0aab01db73;hpb=61bda3c7438f57086b0fcf87cc54407efcbaf9e3;p=collectd.git diff --git a/src/write_graphite.c b/src/write_graphite.c index 504ea9d4..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. */ @@ -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; }; @@ -186,6 +190,7 @@ 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; @@ -197,6 +202,13 @@ static int wg_callback_init (struct wg_callback *cb) 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;