X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fwrite_graphite.c;h=6baace14410e48f72761d21d6d2db1c9fdb854ad;hb=7bd40e39de0841948dde75f95767c90ab3fff7ac;hp=e65f3d8a4ca822f6966b0f75aed5fdc088945cfc;hpb=6b94b7b11db35ec179dc447ddb2ceba6eec97d37;p=collectd.git

diff --git a/src/write_graphite.c b/src/write_graphite.c
index e65f3d8a..6baace14 100644
--- a/src/write_graphite.c
+++ b/src/write_graphite.c
@@ -95,35 +95,35 @@ struct wg_callback
     c_complain_t init_complaint;
     cdtime_t last_connect_time;
 
-    /*Force reconnect useful for load balanced environments*/
-    cdtime_t last_force_reconnect_time;
-    int force_reconnect_timeout;
-    int conn_forced_closed;
+    /* Force reconnect useful for load balanced environments */
+    cdtime_t last_reconnect_time;
+    cdtime_t reconnect_interval;
+    _Bool reconnect_interval_reached;
 };
 
-/*
-* Force Reconnect functions
-*/
-
-static void wg_force_reconnect_check(struct wg_callback *cb)
+/* wg_force_reconnect_check closes cb->sock_fd when it was open for longer
+ * than cb->reconnect_interval. Must hold cb->send_lock when calling. */
+static void wg_force_reconnect_check (struct wg_callback *cb)
 {
     cdtime_t now;
-    if(!cb->force_reconnect_timeout) return;
-    //check if address changes if addr_timeout
+
+    if (cb->reconnect_interval == 0)
+        return;
+
+    /* check if address changes if addr_timeout */
     now = cdtime ();
-    DEBUG("wg_force_reconnect_check: now %ld last: %ld ",CDTIME_T_TO_TIME_T(now),CDTIME_T_TO_TIME_T(cb->last_force_reconnect_time));
-    if ((now - cb->last_force_reconnect_time) < TIME_T_TO_CDTIME_T(cb->force_reconnect_timeout)){
-       return;
-    }
-    //here we should close connection on next
+    if ((now - cb->last_reconnect_time) < cb->reconnect_interval)
+        return;
+
+    /* here we should close connection on next */
     close (cb->sock_fd);
     cb->sock_fd = -1;
-    INFO("Connection Forced closed after %ld seconds ",CDTIME_T_TO_TIME_T(now - cb->last_force_reconnect_time));
-    cb->last_force_reconnect_time = now;
-    cb->conn_forced_closed=1;
-}
-
+    cb->last_reconnect_time = now;
+    cb->reconnect_interval_reached = 1;
 
+    INFO ("write_graphite plugin: Connection closed after %.3f seconds.",
+          CDTIME_T_TO_DOUBLE (now - cb->last_reconnect_time));
+}
 
 /*
  * Functions
@@ -141,7 +141,7 @@ 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 (status < 0)
+    if (status != 0)
     {
         if (cb->log_send_errors)
         {
@@ -277,16 +277,15 @@ static int wg_callback_init (struct wg_callback *cb)
                 "write_graphite plugin: Successfully connected to %s:%s via %s.",
                 cb->node, cb->service, cb->protocol);
     }
-    if(!cb->conn_forced_closed || cb->send_buf_free== 0)
-    {
-        /*when not forced connection*/
-        /*or buffer not initialized -- happens if forceReconnect happens before first connection*/
+
+    /* wg_force_reconnect_check does not flush the buffer before closing a
+     * sending socket, so only call wg_reset_buffer() if the socket was closed
+     * for a different reason (tracked in cb->reconnect_interval_reached). */
+    if (!cb->reconnect_interval_reached || (cb->send_buf_free == 0))
         wg_reset_buffer (cb);
-    }
-    else {
-         /*if forced connection don't reset buffer with valid metrics when reconnect*/
-         cb->conn_forced_closed=0;
-    }
+    else
+        cb->reconnect_interval_reached = 0;
+
     return (0);
 }
 
@@ -361,7 +360,7 @@ static int wg_send_message (char const *message, struct wg_callback *cb)
 
     pthread_mutex_lock (&cb->send_lock);
 
-    wg_force_reconnect_check(cb);
+    wg_force_reconnect_check (cb);
 
     if (cb->sock_fd < 0)
     {
@@ -499,9 +498,9 @@ static int wg_config_node (oconfig_item_t *ci)
     cb->node = strdup (WG_DEFAULT_NODE);
     cb->service = strdup (WG_DEFAULT_SERVICE);
     cb->protocol = strdup (WG_DEFAULT_PROTOCOL);
-    cb->last_force_reconnect_time=cdtime();
-    cb->force_reconnect_timeout=0;
-    cb->conn_forced_closed=0;
+    cb->last_reconnect_time = cdtime();
+    cb->reconnect_interval = 0;
+    cb->reconnect_interval_reached = 0;
     cb->log_send_errors = WG_DEFAULT_LOG_SEND_ERRORS;
     cb->prefix = NULL;
     cb->postfix = NULL;
@@ -542,8 +541,8 @@ static int wg_config_node (oconfig_item_t *ci)
                 status = -1;
             }
         }
-        else if (strcasecmp ("ForceReconnectTimeout", child->key) == 0)
-            cf_util_get_int (child,&cb->force_reconnect_timeout);
+        else if (strcasecmp ("ReconnectInterval", child->key) == 0)
+            cf_util_get_cdtime (child, &cb->reconnect_interval);
         else if (strcasecmp ("LogSendErrors", child->key) == 0)
             cf_util_get_boolean (child, &cb->log_send_errors);
         else if (strcasecmp ("Prefix", child->key) == 0)