From: Paul Sadauskas <psadauskas@gmail.com>
Date: Mon, 22 Jun 2009 21:06:25 +0000 (-0600)
Subject: http plugin: Better error handling, and flush before shutdown
X-Git-Tag: collectd-4.8.0~26^2~21
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=85e490aca52f057b98e50ae0612751c82878a51b;p=collectd.git

http plugin: Better error handling, and flush before shutdown
---

diff --git a/src/http.c b/src/http.c
index f38079e1..09f9cfdd 100644
--- a/src/http.c
+++ b/src/http.c
@@ -305,7 +305,7 @@ static void http_init_buffer (void)  /* {{{ */
         send_buffer_fill = 0;
 } /* }}} http_init_buffer */
 
-static void http_send_buffer (char *buffer) /* {{{ */
+static int http_send_buffer (char *buffer) /* {{{ */
 {
         int status = 0;
         curl_easy_setopt (curl, CURLOPT_POSTFIELDS, buffer);
@@ -315,15 +315,19 @@ static void http_send_buffer (char *buffer) /* {{{ */
                 ERROR ("http plugin: curl_easy_perform failed with staus %i: %s",
                                 status, curl_errbuf);
         }
+        return (status);
 } /* }}} http_send_buffer */
 
-static void http_flush_buffer (void) /* {{{ */
+static int http_flush_buffer (void) /* {{{ */
 {
+        int status = 0;
 	DEBUG ("http plugin: flush_buffer: send_buffer_fill = %i",
 			send_buffer_fill);
 
-	http_send_buffer (send_buffer);
+	status = http_send_buffer (send_buffer);
 	http_init_buffer ();
+
+        return (status);
 } /* }}} http_flush_buffer */
 
 static int http_write (const data_set_t *ds, const value_list_t *vl, /* {{{ */
@@ -374,7 +378,10 @@ static int http_write (const data_set_t *ds, const value_list_t *vl, /* {{{ */
 
     if ((sizeof (send_buffer) - send_buffer_fill) < 128)
     {
-            http_flush_buffer();
+            status = http_flush_buffer();
+            if (status != 0)
+                    return status;
+
     }
 
     pthread_mutex_unlock (&send_lock);
@@ -388,6 +395,7 @@ static int http_write (const data_set_t *ds, const value_list_t *vl, /* {{{ */
 
 static int http_shutdown (void) /* {{{ */
 {
+        http_flush_buffer();
         curl_easy_cleanup(curl);
         return (0);
 }