X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fnginx.c;h=88118b9b7044e3ad5d008b914596731b5e9b1599;hb=6ca32c47f6307ab3fb946cafce9a52b024115b59;hp=f212461be94799b48c20f9014ba960215d1e6953;hpb=be126043c2be20399d7670fe194645292018bde0;p=collectd.git diff --git a/src/nginx.c b/src/nginx.c index f212461b..88118b9b 100644 --- a/src/nginx.c +++ b/src/nginx.c @@ -123,7 +123,7 @@ static int init(void) { #else static char credentials[1024]; int status = snprintf(credentials, sizeof(credentials), "%s:%s", user, - pass == NULL ? "" : pass); + pass == NULL ? "" : pass); if ((status < 0) || ((size_t)status >= sizeof(credentials))) { ERROR("nginx plugin: Credentials would have been truncated."); return -1; @@ -133,10 +133,6 @@ static int init(void) { #endif } - if (url != NULL) { - curl_easy_setopt(curl, CURLOPT_URL, url); - } - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L); curl_easy_setopt(curl, CURLOPT_MAXREDIRS, 50L); @@ -207,6 +203,9 @@ static int nginx_read(void) { return -1; nginx_buffer_len = 0; + + curl_easy_setopt(curl, CURLOPT_URL, url); + if (curl_easy_perform(curl) != CURLE_OK) { WARNING("nginx plugin: curl_easy_perform failed: %s", nginx_curl_error); return -1;