projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
virt: Fix memory leak with libvirt MetadataXPath enabled
[collectd.git]
/
src
/
nginx.c
diff --git
a/src/nginx.c
b/src/nginx.c
index
0f1da0a
..
0da66ce
100644
(file)
--- a/
src/nginx.c
+++ b/
src/nginx.c
@@
-28,23
+28,23
@@
#include "collectd.h"
#include "collectd.h"
-#include "common.h"
#include "plugin.h"
#include "plugin.h"
+#include "utils/common/common.h"
#include <curl/curl.h>
#include <curl/curl.h>
-static char *url
= NULL
;
-static char *user
= NULL
;
-static char *pass
= NULL
;
-static char *verify_peer
= NULL
;
-static char *verify_host
= NULL
;
-static char *cacert
= NULL
;
-static char *timeout
= NULL
;
+static char *url;
+static char *user;
+static char *pass;
+static char *verify_peer;
+static char *verify_host;
+static char *cacert;
+static char *timeout;
-static CURL *curl
= NULL
;
+static CURL *curl;
static char nginx_buffer[16384];
static char nginx_buffer[16384];
-static size_t nginx_buffer_len
= 0
;
+static size_t nginx_buffer_len;
static char nginx_curl_error[CURL_ERROR_SIZE];
static const char *config_keys[] = {
static char nginx_curl_error[CURL_ERROR_SIZE];
static const char *config_keys[] = {
@@
-133,10
+133,6
@@
static int init(void) {
#endif
}
#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);
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;
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;
if (curl_easy_perform(curl) != CURLE_OK) {
WARNING("nginx plugin: curl_easy_perform failed: %s", nginx_curl_error);
return -1;