X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fwrite_http.c;h=ed596bbf56b9e9ee88becd425126951a4591fb91;hb=1fc00932fd49fa535551cc4bba09c4e4be059ab4;hp=d97bc9b52ce9fde8b736d80d31bb0ede208f9f70;hpb=6299d39b903cb87a3db5b6d2148a2d717754a30a;p=collectd.git diff --git a/src/write_http.c b/src/write_http.c index d97bc9b5..ed596bbf 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,6 +59,9 @@ struct wh_callback_s char *clientkeypass; long sslversion; _Bool store_rates; + int low_speed_limit; + time_t low_speed_time; + int timeout; #define WH_FORMAT_COMMAND 0 #define WH_FORMAT_JSON 1 @@ -120,6 +124,19 @@ static int wh_callback_init (wh_callback_t *cb) /* {{{ */ return (-1); } + if (cb->low_speed_limit > 0 && cb->low_speed_time > 0) + { + 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); @@ -134,9 +151,16 @@ static int wh_callback_init (wh_callback_t *cb) /* {{{ */ 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; @@ -153,6 +177,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); } @@ -289,6 +314,7 @@ static void wh_callback_free (void *data) /* {{{ */ curl_easy_cleanup (cb->curl); cb->curl = NULL; } + sfree (cb->name); sfree (cb->location); sfree (cb->user); sfree (cb->pass); @@ -491,11 +517,12 @@ 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 i; cb = malloc (sizeof (*cb)); @@ -509,18 +536,24 @@ 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; 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) + if (strcasecmp ("URL", child->key) == 0) + cf_util_get_string (child, &cb->location); + else if (strcasecmp ("User", child->key) == 0) cf_util_get_string (child, &cb->user); else if (strcasecmp ("Password", child->key) == 0) cf_util_get_string (child, &cb->pass); @@ -572,6 +605,10 @@ static int wh_config_url (oconfig_item_t *ci) /* {{{ */ 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) + cf_util_get_int (child, &cb->low_speed_limit); + else if (strcasecmp ("Timeout", child->key) == 0) + cf_util_get_int (child, &cb->timeout); else { ERROR ("write_http plugin: Invalid configuration " @@ -579,6 +616,17 @@ static int wh_config_url (oconfig_item_t *ci) /* {{{ */ } } + if (cb->location == NULL) + { + 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) @@ -598,19 +646,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) /* {{{ */ { @@ -620,8 +670,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 "