From: Florian Forster <octo@collectd.org>
Date: Tue, 16 Sep 2014 14:05:52 +0000 (+0200)
Subject: write_graphite plugin: Limit number of reconnection attempts per time.
X-Git-Tag: collectd-5.5.0~185
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=647cfb174e866b21decf647f9abe8b2fa6f9803c;p=collectd.git

write_graphite plugin: Limit number of reconnection attempts per time.

Fixes: #625
---

diff --git a/src/write_graphite.c b/src/write_graphite.c
index c17b7f36..5c7bbd55 100644
--- a/src/write_graphite.c
+++ b/src/write_graphite.c
@@ -83,6 +83,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 +113,7 @@ struct wg_callback
 
     pthread_mutex_t send_lock;
     c_complain_t init_complaint;
+    cdtime_t last_connect_time;
 };
 
 
@@ -186,6 +191,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;
@@ -195,6 +201,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;