X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fwrite_http.c;h=ec3a01ce228aeb7798a611333b90fdb9d2b4630d;hb=5c2993e4121feae745551be182221b31bc23ff97;hp=80f42ab5b365801b195018b43e05e8bcf54bff43;hpb=9552451c88ea3e482783f2a328bec457373fb3e0;p=collectd.git diff --git a/src/write_http.c b/src/write_http.c index 80f42ab5..ec3a01ce 100644 --- a/src/write_http.c +++ b/src/write_http.c @@ -44,8 +44,9 @@ */ struct wh_callback_s { - char *location; + char *name; + char *location; char *user; char *pass; char *credentials; @@ -58,14 +59,17 @@ struct wh_callback_s char *clientkeypass; long sslversion; _Bool store_rates; - int abort_on_slow; - time_t interval; + _Bool log_http_error; + int low_speed_limit; + time_t low_speed_time; + int timeout; #define WH_FORMAT_COMMAND 0 #define WH_FORMAT_JSON 1 int format; CURL *curl; + struct curl_slist *headers; char curl_errbuf[CURL_ERROR_SIZE]; char *send_buffer; @@ -78,6 +82,19 @@ struct wh_callback_s }; typedef struct wh_callback_s wh_callback_t; +static void wh_log_http_error (wh_callback_t *cb) +{ + if (!cb->log_http_error) + return; + + long http_code = 0; + + curl_easy_getinfo (cb->curl, CURLINFO_RESPONSE_CODE, &http_code); + + if (http_code != 200) + INFO ("write_http plugin: HTTP Error code: %lu", http_code); +} + static void wh_reset_buffer (wh_callback_t *cb) /* {{{ */ { memset (cb->send_buffer, 0, cb->send_buffer_size); @@ -99,6 +116,9 @@ static int wh_send_buffer (wh_callback_t *cb) /* {{{ */ curl_easy_setopt (cb->curl, CURLOPT_POSTFIELDS, cb->send_buffer); status = curl_easy_perform (cb->curl); + + wh_log_http_error (cb); + if (status != CURLE_OK) { ERROR ("write_http plugin: curl_easy_perform failed with " @@ -110,8 +130,6 @@ static int wh_send_buffer (wh_callback_t *cb) /* {{{ */ static int wh_callback_init (wh_callback_t *cb) /* {{{ */ { - struct curl_slist *headers; - if (cb->curl != NULL) return (0); @@ -122,29 +140,43 @@ static int wh_callback_init (wh_callback_t *cb) /* {{{ */ return (-1); } - if(cb->abort_on_slow && cb->interval > 0) + if (cb->low_speed_limit > 0 && cb->low_speed_time > 0) { - curl_easy_setopt(cb->curl, CURLOPT_LOW_SPEED_LIMIT, 100); - curl_easy_setopt(cb->curl, CURLOPT_LOW_SPEED_TIME, cb->interval); + curl_easy_setopt (cb->curl, CURLOPT_LOW_SPEED_LIMIT, + (long) (cb->low_speed_limit * cb->low_speed_time)); + curl_easy_setopt (cb->curl, CURLOPT_LOW_SPEED_TIME, + (long) cb->low_speed_time); } +#ifdef HAVE_CURLOPT_TIMEOUT_MS + if (cb->timeout > 0) + curl_easy_setopt (cb->curl, CURLOPT_TIMEOUT_MS, (long) cb->timeout); +#endif + curl_easy_setopt (cb->curl, CURLOPT_NOSIGNAL, 1L); curl_easy_setopt (cb->curl, CURLOPT_USERAGENT, COLLECTD_USERAGENT); - headers = NULL; - headers = curl_slist_append (headers, "Accept: */*"); + cb->headers = NULL; + cb->headers = curl_slist_append (cb->headers, "Accept: */*"); if (cb->format == WH_FORMAT_JSON) - headers = curl_slist_append (headers, "Content-Type: application/json"); + cb->headers = curl_slist_append (cb->headers, "Content-Type: application/json"); else - headers = curl_slist_append (headers, "Content-Type: text/plain"); - headers = curl_slist_append (headers, "Expect:"); - curl_easy_setopt (cb->curl, CURLOPT_HTTPHEADER, headers); + cb->headers = curl_slist_append (cb->headers, "Content-Type: text/plain"); + cb->headers = curl_slist_append (cb->headers, "Expect:"); + curl_easy_setopt (cb->curl, CURLOPT_HTTPHEADER, cb->headers); curl_easy_setopt (cb->curl, CURLOPT_ERRORBUFFER, cb->curl_errbuf); curl_easy_setopt (cb->curl, CURLOPT_URL, cb->location); + curl_easy_setopt (cb->curl, CURLOPT_FOLLOWLOCATION, 1L); + curl_easy_setopt (cb->curl, CURLOPT_MAXREDIRS, 50L); if (cb->user != NULL) { +#ifdef HAVE_CURLOPT_USERNAME + curl_easy_setopt (cb->curl, CURLOPT_USERNAME, cb->user); + curl_easy_setopt (cb->curl, CURLOPT_PASSWORD, + (cb->pass == NULL) ? "" : cb->pass); +#else size_t credentials_size; credentials_size = strlen (cb->user) + 2; @@ -161,6 +193,7 @@ static int wh_callback_init (wh_callback_t *cb) /* {{{ */ ssnprintf (cb->credentials, credentials_size, "%s:%s", cb->user, (cb->pass == NULL) ? "" : cb->pass); curl_easy_setopt (cb->curl, CURLOPT_USERPWD, cb->credentials); +#endif curl_easy_setopt (cb->curl, CURLOPT_HTTPAUTH, CURLAUTH_ANY); } @@ -297,6 +330,14 @@ static void wh_callback_free (void *data) /* {{{ */ curl_easy_cleanup (cb->curl); cb->curl = NULL; } + + if (cb->headers != NULL) + { + curl_slist_free_all (cb->headers); + cb->headers = NULL; + } + + sfree (cb->name); sfree (cb->location); sfree (cb->user); sfree (cb->pass); @@ -355,8 +396,6 @@ static int wh_write_command (const data_set_t *ds, const value_list_t *vl, /* {{ return (-1); } - cb->interval = CDTIME_T_TO_TIME_T(vl->interval); - pthread_mutex_lock (&cb->send_lock); if (cb->curl == NULL) @@ -404,8 +443,6 @@ static int wh_write_json (const data_set_t *ds, const value_list_t *vl, /* {{{ * wh_callback_t *cb) { int status; - - cb->interval = CDTIME_T_TO_TIME_T(vl->interval); pthread_mutex_lock (&cb->send_lock); @@ -503,11 +540,13 @@ static int config_set_format (wh_callback_t *cb, /* {{{ */ return (0); } /* }}} int config_set_format */ -static int wh_config_url (oconfig_item_t *ci) /* {{{ */ +static int wh_config_node (oconfig_item_t *ci) /* {{{ */ { wh_callback_t *cb; int buffer_size = 0; user_data_t user_data; + char callback_name[DATA_MAX_NAME_LEN]; + int status = 0; int i; cb = malloc (sizeof (*cb)); @@ -521,40 +560,51 @@ static int wh_config_url (oconfig_item_t *ci) /* {{{ */ cb->verify_host = 1; cb->format = WH_FORMAT_COMMAND; cb->sslversion = CURL_SSLVERSION_DEFAULT; + cb->low_speed_limit = 0; + cb->timeout = 0; + cb->log_http_error = 0; + cb->headers = NULL; + pthread_mutex_init (&cb->send_lock, /* attr = */ NULL); - cf_util_get_string (ci, &cb->location); - if (cb->location == NULL) - return (-1); + cf_util_get_string (ci, &cb->name); + + /* FIXME: Remove this legacy mode in version 6. */ + if (strcasecmp ("URL", ci->key) == 0) + cf_util_get_string (ci, &cb->location); for (i = 0; i < ci->children_num; i++) { oconfig_item_t *child = ci->children + i; - if (strcasecmp ("User", child->key) == 0) - cf_util_get_string (child, &cb->user); + if (strcasecmp ("URL", child->key) == 0) + status = cf_util_get_string (child, &cb->location); + else if (strcasecmp ("User", child->key) == 0) + status = cf_util_get_string (child, &cb->user); else if (strcasecmp ("Password", child->key) == 0) - cf_util_get_string (child, &cb->pass); + status = cf_util_get_string (child, &cb->pass); else if (strcasecmp ("VerifyPeer", child->key) == 0) - cf_util_get_boolean (child, &cb->verify_peer); + status = cf_util_get_boolean (child, &cb->verify_peer); else if (strcasecmp ("VerifyHost", child->key) == 0) - cf_util_get_boolean (child, &cb->verify_host); + status = cf_util_get_boolean (child, &cb->verify_host); else if (strcasecmp ("CACert", child->key) == 0) - cf_util_get_string (child, &cb->cacert); + status = cf_util_get_string (child, &cb->cacert); else if (strcasecmp ("CAPath", child->key) == 0) - cf_util_get_string (child, &cb->capath); + status = cf_util_get_string (child, &cb->capath); else if (strcasecmp ("ClientKey", child->key) == 0) - cf_util_get_string (child, &cb->clientkey); + status = cf_util_get_string (child, &cb->clientkey); else if (strcasecmp ("ClientCert", child->key) == 0) - cf_util_get_string (child, &cb->clientcert); + status = cf_util_get_string (child, &cb->clientcert); else if (strcasecmp ("ClientKeyPass", child->key) == 0) - cf_util_get_string (child, &cb->clientkeypass); + status = cf_util_get_string (child, &cb->clientkeypass); else if (strcasecmp ("SSLVersion", child->key) == 0) { char *value = NULL; - cf_util_get_string (child, &value); + status = cf_util_get_string (child, &value); + if (status != 0) + break; if (value == NULL || strcasecmp ("default", value) == 0) cb->sslversion = CURL_SSLVERSION_DEFAULT; @@ -573,31 +623,54 @@ static int wh_config_url (oconfig_item_t *ci) /* {{{ */ cb->sslversion = CURL_SSLVERSION_TLSv1_2; #endif else + { ERROR ("write_http plugin: Invalid SSLVersion " "option: %s.", value); + status = EINVAL; + } sfree(value); } else if (strcasecmp ("Format", child->key) == 0) - config_set_format (cb, child); + status = config_set_format (cb, child); else if (strcasecmp ("StoreRates", child->key) == 0) - cf_util_get_boolean (child, &cb->store_rates); + status = cf_util_get_boolean (child, &cb->store_rates); else if (strcasecmp ("BufferSize", child->key) == 0) - cf_util_get_int (child, &buffer_size); - else if (strcasecmp ("LowSpeedLimit", child->key) == 0) - config_set_boolean (&cb->abort_on_slow, child); + status = cf_util_get_int (child, &buffer_size); + else if (strcasecmp ("LowSpeedLimit", child->key) == 0) + status = cf_util_get_int (child, &cb->low_speed_limit); + else if (strcasecmp ("Timeout", child->key) == 0) + status = cf_util_get_int (child, &cb->timeout); + else if (strcasecmp ("LogHttpError", child->key) == 0) + status = cf_util_get_boolean (child, &cb->log_http_error); else { ERROR ("write_http plugin: Invalid configuration " "option: %s.", child->key); + status = EINVAL; } + + if (status != 0) + break; + } + + if (status != 0) + { + wh_callback_free (cb); + return (status); } - if(cb->abort_on_slow) + if (cb->location == NULL) { - cb->interval = CDTIME_T_TO_TIME_T(cf_get_default_interval ()); + ERROR ("write_http plugin: no URL defined for instance '%s'", + cb->name); + wh_callback_free (cb); + return (-1); } + if (cb->low_speed_limit > 0) + cb->low_speed_time = CDTIME_T_TO_TIME_T(plugin_get_interval()); + /* Determine send_buffer_size. */ cb->send_buffer_size = WRITE_HTTP_DEFAULT_BUFFER_SIZE; if (buffer_size >= 1024) @@ -617,19 +690,21 @@ static int wh_config_url (oconfig_item_t *ci) /* {{{ */ /* Nulls the buffer and sets ..._free and ..._fill. */ wh_reset_buffer (cb); - DEBUG ("write_http: Registering write callback with URL %s", - cb->location); + ssnprintf (callback_name, sizeof (callback_name), "write_http/%s", + cb->name); + DEBUG ("write_http: Registering write callback '%s' with URL '%s'", + callback_name, cb->location); memset (&user_data, 0, sizeof (user_data)); user_data.data = cb; user_data.free_func = NULL; - plugin_register_flush ("write_http", wh_flush, &user_data); + plugin_register_flush (callback_name, wh_flush, &user_data); user_data.free_func = wh_callback_free; - plugin_register_write ("write_http", wh_write, &user_data); + plugin_register_write (callback_name, wh_write, &user_data); return (0); -} /* }}} int wh_config_url */ +} /* }}} int wh_config_node */ static int wh_config (oconfig_item_t *ci) /* {{{ */ { @@ -639,8 +714,14 @@ static int wh_config (oconfig_item_t *ci) /* {{{ */ { oconfig_item_t *child = ci->children + i; - if (strcasecmp ("URL", child->key) == 0) - wh_config_url (child); + if (strcasecmp ("Node", child->key) == 0) + wh_config_node (child); + /* FIXME: Remove this legacy mode in version 6. */ + else if (strcasecmp ("URL", child->key) == 0) { + WARNING ("write_http plugin: Legacy block found. " + "Please use instead."); + wh_config_node (child); + } else { ERROR ("write_http plugin: Invalid configuration "