projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #3158 from smortex/riemann-meta-data
[collectd.git]
/
src
/
ascent.c
diff --git
a/src/ascent.c
b/src/ascent.c
index
5f0d85e
..
e5589bf
100644
(file)
--- a/
src/ascent.c
+++ b/
src/ascent.c
@@
-26,8
+26,8
@@
#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 <libxml/parser.h>
#include <curl/curl.h>
#include <libxml/parser.h>
@@
-87,19
+87,19
@@
typedef struct player_info_s player_info_t;
#define PLAYER_INFO_STATIC_INIT \
{ -1, -1, -1, -1, -1 }
#define PLAYER_INFO_STATIC_INIT \
{ -1, -1, -1, -1, -1 }
-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 *ascent_buffer
= NULL
;
-static size_t ascent_buffer_size
= 0
;
-static size_t ascent_buffer_fill
= 0
;
+static char *ascent_buffer;
+static size_t ascent_buffer_size;
+static size_t ascent_buffer_fill;
static char ascent_curl_error[CURL_ERROR_SIZE];
static const char *config_keys[] = {
static char ascent_curl_error[CURL_ERROR_SIZE];
static const char *config_keys[] = {
@@
-125,7
+125,7
@@
static int ascent_submit_gauge(const char *plugin_instance, /* {{{ */
sstrncpy(vl.type_instance, type_instance, sizeof(vl.type_instance));
plugin_dispatch_values(&vl);
sstrncpy(vl.type_instance, type_instance, sizeof(vl.type_instance));
plugin_dispatch_values(&vl);
- return
(0)
;
+ return
0
;
} /* }}} int ascent_submit_gauge */
static size_t ascent_curl_callback(void *buf, size_t size,
} /* }}} int ascent_submit_gauge */
static size_t ascent_curl_callback(void *buf, size_t size,
@@
-134,7
+134,7
@@
static size_t ascent_curl_callback(void *buf, size_t size,
size_t len = size * nmemb;
if (len == 0)
size_t len = size * nmemb;
if (len == 0)
- return
(len)
;
+ return
len
;
if ((ascent_buffer_fill + len) >= ascent_buffer_size) {
char *temp;
if ((ascent_buffer_fill + len) >= ascent_buffer_size) {
char *temp;
@@
-142,7
+142,7
@@
static size_t ascent_curl_callback(void *buf, size_t size,
temp = realloc(ascent_buffer, ascent_buffer_fill + len + 1);
if (temp == NULL) {
ERROR("ascent plugin: realloc failed.");
temp = realloc(ascent_buffer, ascent_buffer_fill + len + 1);
if (temp == NULL) {
ERROR("ascent plugin: realloc failed.");
- return
(0)
;
+ return
0
;
}
ascent_buffer = temp;
ascent_buffer_size = ascent_buffer_fill + len + 1;
}
ascent_buffer = temp;
ascent_buffer_size = ascent_buffer_fill + len + 1;
@@
-152,7
+152,7
@@
static size_t ascent_curl_callback(void *buf, size_t size,
ascent_buffer_fill += len;
ascent_buffer[ascent_buffer_fill] = 0;
ascent_buffer_fill += len;
ascent_buffer[ascent_buffer_fill] = 0;
- return
(len)
;
+ return
len
;
} /* }}} size_t ascent_curl_callback */
static int ascent_submit_players(player_stats_t *ps) /* {{{ */
} /* }}} size_t ascent_curl_callback */
static int ascent_submit_players(player_stats_t *ps) /* {{{ */
@@
-187,7
+187,7
@@
static int ascent_submit_players(player_stats_t *ps) /* {{{ */
value = ((double)ps->latency_sum) / (1000.0 * ((double)ps->latency_num));
ascent_submit_gauge(NULL, "latency", "average", value);
value = ((double)ps->latency_sum) / (1000.0 * ((double)ps->latency_num));
ascent_submit_gauge(NULL, "latency", "average", value);
- return
(0)
;
+ return
0
;
} /* }}} int ascent_submit_players */
static int ascent_account_player(player_stats_t *ps, /* {{{ */
} /* }}} int ascent_submit_players */
static int ascent_account_player(player_stats_t *ps, /* {{{ */
@@
-226,7
+226,7
@@
static int ascent_account_player(player_stats_t *ps, /* {{{ */
ps->latency_num++;
}
ps->latency_num++;
}
- return
(0)
;
+ return
0
;
} /* }}} int ascent_account_player */
static int ascent_xml_submit_gauge(xmlDoc *doc, xmlNode *node, /* {{{ */
} /* }}} int ascent_account_player */
static int ascent_xml_submit_gauge(xmlDoc *doc, xmlNode *node, /* {{{ */
@@
-240,7
+240,7
@@
static int ascent_xml_submit_gauge(xmlDoc *doc, xmlNode *node, /* {{{ */
if (str_ptr == NULL) {
ERROR(
"ascent plugin: ascent_xml_submit_gauge: xmlNodeListGetString failed.");
if (str_ptr == NULL) {
ERROR(
"ascent plugin: ascent_xml_submit_gauge: xmlNodeListGetString failed.");
- return
(-1)
;
+ return
-1
;
}
if (strcasecmp("N/A", str_ptr) == 0)
}
if (strcasecmp("N/A", str_ptr) == 0)
@@
-251,12
+251,12
@@
static int ascent_xml_submit_gauge(xmlDoc *doc, xmlNode *node, /* {{{ */
if (str_ptr == end_ptr) {
xmlFree(str_ptr);
ERROR("ascent plugin: ascent_xml_submit_gauge: strtod failed.");
if (str_ptr == end_ptr) {
xmlFree(str_ptr);
ERROR("ascent plugin: ascent_xml_submit_gauge: strtod failed.");
- return
(-1)
;
+ return
-1
;
}
}
xmlFree(str_ptr);
}
}
xmlFree(str_ptr);
- return
(ascent_submit_gauge(plugin_instance, type, type_instance, value)
);
+ return
ascent_submit_gauge(plugin_instance, type, type_instance, value
);
} /* }}} int ascent_xml_submit_gauge */
static int ascent_xml_read_int(xmlDoc *doc, xmlNode *node, /* {{{ */
} /* }}} int ascent_xml_submit_gauge */
static int ascent_xml_read_int(xmlDoc *doc, xmlNode *node, /* {{{ */
@@
-267,7
+267,7
@@
static int ascent_xml_read_int(xmlDoc *doc, xmlNode *node, /* {{{ */
str_ptr = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
if (str_ptr == NULL) {
ERROR("ascent plugin: ascent_xml_read_int: xmlNodeListGetString failed.");
str_ptr = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
if (str_ptr == NULL) {
ERROR("ascent plugin: ascent_xml_read_int: xmlNodeListGetString failed.");
- return
(-1)
;
+ return
-1
;
}
if (strcasecmp("N/A", str_ptr) == 0)
}
if (strcasecmp("N/A", str_ptr) == 0)
@@
-278,13
+278,13
@@
static int ascent_xml_read_int(xmlDoc *doc, xmlNode *node, /* {{{ */
if (str_ptr == end_ptr) {
xmlFree(str_ptr);
ERROR("ascent plugin: ascent_xml_read_int: strtol failed.");
if (str_ptr == end_ptr) {
xmlFree(str_ptr);
ERROR("ascent plugin: ascent_xml_read_int: strtol failed.");
- return
(-1)
;
+ return
-1
;
}
}
xmlFree(str_ptr);
*ret_value = value;
}
}
xmlFree(str_ptr);
*ret_value = value;
- return
(0)
;
+ return
0
;
} /* }}} int ascent_xml_read_int */
static int ascent_xml_sessions_plr(xmlDoc *doc, xmlNode *node, /* {{{ */
} /* }}} int ascent_xml_read_int */
static int ascent_xml_sessions_plr(xmlDoc *doc, xmlNode *node, /* {{{ */
@@
-317,7
+317,7
@@
static int ascent_xml_sessions_plr(xmlDoc *doc, xmlNode *node, /* {{{ */
}
} /* for (child) */
}
} /* for (child) */
- return
(0)
;
+ return
0
;
} /* }}} int ascent_xml_sessions_plr */
static int ascent_xml_sessions(xmlDoc *doc, xmlNode *node) /* {{{ */
} /* }}} int ascent_xml_sessions_plr */
static int ascent_xml_sessions(xmlDoc *doc, xmlNode *node) /* {{{ */
@@
-343,7
+343,7
@@
static int ascent_xml_sessions(xmlDoc *doc, xmlNode *node) /* {{{ */
ascent_submit_players(&ps);
ascent_submit_players(&ps);
- return
(0)
;
+ return
0
;
} /* }}} int ascent_xml_sessions */
static int ascent_xml_status(xmlDoc *doc, xmlNode *node) /* {{{ */
} /* }}} int ascent_xml_sessions */
static int ascent_xml_status(xmlDoc *doc, xmlNode *node) /* {{{ */
@@
-380,7
+380,7
@@
static int ascent_xml_status(xmlDoc *doc, xmlNode *node) /* {{{ */
}
} /* for (child) */
}
} /* for (child) */
- return
(0)
;
+ return
0
;
} /* }}} int ascent_xml_status */
static int ascent_xml(const char *data) /* {{{ */
} /* }}} int ascent_xml_status */
static int ascent_xml(const char *data) /* {{{ */
@@
-398,20
+398,20
@@
static int ascent_xml(const char *data) /* {{{ */
#endif
if (doc == NULL) {
ERROR("ascent plugin: xmlParseMemory failed.");
#endif
if (doc == NULL) {
ERROR("ascent plugin: xmlParseMemory failed.");
- return
(-1)
;
+ return
-1
;
}
cur = xmlDocGetRootElement(doc);
if (cur == NULL) {
ERROR("ascent plugin: XML document is empty.");
xmlFreeDoc(doc);
}
cur = xmlDocGetRootElement(doc);
if (cur == NULL) {
ERROR("ascent plugin: XML document is empty.");
xmlFreeDoc(doc);
- return
(-1)
;
+ return
-1
;
}
if (xmlStrcmp((const xmlChar *)"serverpage", cur->name) != 0) {
ERROR("ascent plugin: XML root element is not \"serverpage\".");
xmlFreeDoc(doc);
}
if (xmlStrcmp((const xmlChar *)"serverpage", cur->name) != 0) {
ERROR("ascent plugin: XML root element is not \"serverpage\".");
xmlFreeDoc(doc);
- return
(-1)
;
+ return
-1
;
}
for (xmlNode *child = cur->xmlChildrenNode; child != NULL;
}
for (xmlNode *child = cur->xmlChildrenNode; child != NULL;
@@
-433,7
+433,7
@@
static int ascent_xml(const char *data) /* {{{ */
} /* for (child) */
xmlFreeDoc(doc);
} /* for (child) */
xmlFreeDoc(doc);
- return
(0)
;
+ return
0
;
} /* }}} int ascent_xml */
static int config_set(char **var, const char *value) /* {{{ */
} /* }}} int ascent_xml */
static int config_set(char **var, const char *value) /* {{{ */
@@
-444,29
+444,29
@@
static int config_set(char **var, const char *value) /* {{{ */
}
if ((*var = strdup(value)) == NULL)
}
if ((*var = strdup(value)) == NULL)
- return
(1)
;
+ return
1
;
else
else
- return
(0)
;
+ return
0
;
} /* }}} int config_set */
static int ascent_config(const char *key, const char *value) /* {{{ */
{
if (strcasecmp(key, "URL") == 0)
} /* }}} int config_set */
static int ascent_config(const char *key, const char *value) /* {{{ */
{
if (strcasecmp(key, "URL") == 0)
- return
(config_set(&url, value)
);
+ return
config_set(&url, value
);
else if (strcasecmp(key, "User") == 0)
else if (strcasecmp(key, "User") == 0)
- return
(config_set(&user, value)
);
+ return
config_set(&user, value
);
else if (strcasecmp(key, "Password") == 0)
else if (strcasecmp(key, "Password") == 0)
- return
(config_set(&pass, value)
);
+ return
config_set(&pass, value
);
else if (strcasecmp(key, "VerifyPeer") == 0)
else if (strcasecmp(key, "VerifyPeer") == 0)
- return
(config_set(&verify_peer, value)
);
+ return
config_set(&verify_peer, value
);
else if (strcasecmp(key, "VerifyHost") == 0)
else if (strcasecmp(key, "VerifyHost") == 0)
- return
(config_set(&verify_host, value)
);
+ return
config_set(&verify_host, value
);
else if (strcasecmp(key, "CACert") == 0)
else if (strcasecmp(key, "CACert") == 0)
- return
(config_set(&cacert, value)
);
+ return
config_set(&cacert, value
);
else if (strcasecmp(key, "Timeout") == 0)
else if (strcasecmp(key, "Timeout") == 0)
- return
(config_set(&timeout, value)
);
+ return
config_set(&timeout, value
);
else
else
- return
(-1)
;
+ return
-1
;
} /* }}} int ascent_config */
static int ascent_init(void) /* {{{ */
} /* }}} int ascent_config */
static int ascent_init(void) /* {{{ */
@@
-474,7
+474,7
@@
static int ascent_init(void) /* {{{ */
if (url == NULL) {
WARNING("ascent plugin: ascent_init: No URL configured, "
"returning an error.");
if (url == NULL) {
WARNING("ascent plugin: ascent_init: No URL configured, "
"returning an error.");
- return
(-1)
;
+ return
-1
;
}
if (curl != NULL) {
}
if (curl != NULL) {
@@
-483,7
+483,7
@@
static int ascent_init(void) /* {{{ */
if ((curl = curl_easy_init()) == NULL) {
ERROR("ascent plugin: ascent_init: curl_easy_init failed.");
if ((curl = curl_easy_init()) == NULL) {
ERROR("ascent plugin: ascent_init: curl_easy_init failed.");
- return
(-1)
;
+ return
-1
;
}
curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1L);
}
curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1L);
@@
-499,19
+499,18
@@
static int ascent_init(void) /* {{{ */
static char credentials[1024];
int status;
static char credentials[1024];
int status;
- status = s
s
nprintf(credentials, sizeof(credentials), "%s:%s", user,
-
(pass == NULL) ? "" : pass);
+ status = snprintf(credentials, sizeof(credentials), "%s:%s", user,
+ (pass == NULL) ? "" : pass);
if ((status < 0) || ((size_t)status >= sizeof(credentials))) {
ERROR("ascent plugin: ascent_init: Returning an error because the "
"credentials have been truncated.");
if ((status < 0) || ((size_t)status >= sizeof(credentials))) {
ERROR("ascent plugin: ascent_init: Returning an error because the "
"credentials have been truncated.");
- return
(-1)
;
+ return
-1
;
}
curl_easy_setopt(curl, CURLOPT_USERPWD, credentials);
#endif
}
}
curl_easy_setopt(curl, CURLOPT_USERPWD, credentials);
#endif
}
- 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);
@@
-536,7
+535,7
@@
static int ascent_init(void) /* {{{ */
(long)CDTIME_T_TO_MS(plugin_get_interval()));
#endif
(long)CDTIME_T_TO_MS(plugin_get_interval()));
#endif
- return
(0)
;
+ return
0
;
} /* }}} int ascent_init */
static int ascent_read(void) /* {{{ */
} /* }}} int ascent_init */
static int ascent_read(void) /* {{{ */
@@
-545,25
+544,28
@@
static int ascent_read(void) /* {{{ */
if (curl == NULL) {
ERROR("ascent plugin: I don't have a CURL object.");
if (curl == NULL) {
ERROR("ascent plugin: I don't have a CURL object.");
- return
(-1)
;
+ return
-1
;
}
if (url == NULL) {
ERROR("ascent plugin: No URL has been configured.");
}
if (url == NULL) {
ERROR("ascent plugin: No URL has been configured.");
- return
(-1)
;
+ return
-1
;
}
ascent_buffer_fill = 0;
}
ascent_buffer_fill = 0;
+
+ curl_easy_setopt(curl, CURLOPT_URL, url);
+
if (curl_easy_perform(curl) != CURLE_OK) {
ERROR("ascent plugin: curl_easy_perform failed: %s", ascent_curl_error);
if (curl_easy_perform(curl) != CURLE_OK) {
ERROR("ascent plugin: curl_easy_perform failed: %s", ascent_curl_error);
- return
(-1)
;
+ return
-1
;
}
status = ascent_xml(ascent_buffer);
if (status != 0)
}
status = ascent_xml(ascent_buffer);
if (status != 0)
- return
(-1)
;
+ return
-1
;
else
else
- return
(0)
;
+ return
0
;
} /* }}} int ascent_read */
void module_register(void) {
} /* }}} int ascent_read */
void module_register(void) {