X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fwrite_http.c;h=361c39e4d240bb807158aefa68987183ccddf78d;hb=f0b5610723ae8962ae264f84210f8bac483bcd20;hp=2c59d64b4ddbb8eae93e02903a5cc8d7f97881a1;hpb=aa434cf4f73aec28334943ce04f8e5e2e370f9c3;p=collectd.git diff --git a/src/write_http.c b/src/write_http.c index 2c59d64b..361c39e4 100644 --- a/src/write_http.c +++ b/src/write_http.c @@ -39,7 +39,6 @@ # define WRITE_HTTP_DEFAULT_BUFFER_SIZE 4096 #endif -#define WH_DEFAULT_LOW_LIMIT_BYTES_PER_SEC 100 /* * Private variables */ @@ -60,9 +59,9 @@ struct wh_callback_s char *clientkeypass; long sslversion; _Bool store_rates; - _Bool abort_on_slow; - int low_limit_bytes; - time_t interval; + _Bool log_http_error; + int low_speed_limit; + time_t low_speed_time; int timeout; #define WH_FORMAT_COMMAND 0 @@ -82,6 +81,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); @@ -103,6 +115,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 " @@ -126,15 +141,18 @@ 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, - (cb->low_limit_bytes ? cb->low_limit_bytes : WH_DEFAULT_LOW_LIMIT_BYTES_PER_SEC)); - curl_easy_setopt (cb->curl, CURLOPT_LOW_SPEED_TIME, cb->interval); + (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, cb->timeout); + 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); @@ -376,7 +394,6 @@ static int wh_write_command (const data_set_t *ds, const value_list_t *vl, /* {{ if (cb->curl == NULL) { - cb->interval = CDTIME_T_TO_TIME_T(vl->interval); status = wh_callback_init (cb); if (status != 0) { @@ -425,8 +442,6 @@ static int wh_write_json (const data_set_t *ds, const value_list_t *vl, /* {{{ * if (cb->curl == NULL) { - cb->interval = CDTIME_T_TO_TIME_T(vl->interval); - status = wh_callback_init (cb); if (status != 0) { @@ -525,6 +540,7 @@ static int wh_config_node (oconfig_item_t *ci) /* {{{ */ 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)); @@ -538,8 +554,9 @@ static int wh_config_node (oconfig_item_t *ci) /* {{{ */ cb->verify_host = 1; cb->format = WH_FORMAT_COMMAND; cb->sslversion = CURL_SSLVERSION_DEFAULT; - cb->low_limit_bytes = WH_DEFAULT_LOW_LIMIT_BYTES_PER_SEC; + cb->low_speed_limit = 0; cb->timeout = 0; + cb->log_http_error = 0; pthread_mutex_init (&cb->send_lock, /* attr = */ NULL); @@ -554,30 +571,32 @@ static int wh_config_node (oconfig_item_t *ci) /* {{{ */ oconfig_item_t *child = ci->children + i; if (strcasecmp ("URL", child->key) == 0) - cf_util_get_string (child, &cb->location); + status = cf_util_get_string (child, &cb->location); else if (strcasecmp ("User", child->key) == 0) - cf_util_get_string (child, &cb->user); + 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; @@ -596,28 +615,41 @@ static int wh_config_node (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); + status = cf_util_get_int (child, &buffer_size); else if (strcasecmp ("LowSpeedLimit", child->key) == 0) - cf_util_get_boolean (child,&cb->abort_on_slow); - else if (strcasecmp ("LowLimitBytesPerSec", child->key) == 0) - cf_util_get_int (child, &cb->low_limit_bytes); + status = cf_util_get_int (child, &cb->low_speed_limit); else if (strcasecmp ("Timeout", child->key) == 0) - cf_util_get_int (child, &cb->timeout); + 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->location == NULL) @@ -628,8 +660,8 @@ static int wh_config_node (oconfig_item_t *ci) /* {{{ */ return (-1); } - if (cb->abort_on_slow) - cb->interval = CDTIME_T_TO_TIME_T(plugin_get_interval()); + 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;