projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Initial support of GPSd in collectd.
[collectd.git]
/
src
/
curl_xml.c
diff --git
a/src/curl_xml.c
b/src/curl_xml.c
index
bbcbc04
..
37a3686
100644
(file)
--- a/
src/curl_xml.c
+++ b/
src/curl_xml.c
@@
-81,6
+81,7
@@
struct cx_s /* {{{ */
_Bool verify_host;
char *cacert;
char *post_body;
_Bool verify_host;
char *cacert;
char *post_body;
+ int timeout;
struct curl_slist *headers;
cx_namespace_t *namespaces;
struct curl_slist *headers;
cx_namespace_t *namespaces;
@@
-342,6
+343,7
@@
static int cx_handle_single_value_xpath (xmlXPathContextPtr xpath_ctx, /* {{{ */
/* free up object */
xmlXPathFreeObject (values_node_obj);
/* free up object */
xmlXPathFreeObject (values_node_obj);
+ sfree (node_value);
/* We have reached here which means that
* we have got something to work */
/* We have reached here which means that
* we have got something to work */
@@
-386,7
+388,7
@@
static int cx_handle_instance_xpath (xmlXPathContextPtr xpath_ctx, /* {{{ */
/* If the base xpath returns more than one block, the result is assumed to be
* a table. The `Instance' option is not optional in this case. Check for the
* condition and inform the user. */
/* If the base xpath returns more than one block, the result is assumed to be
* a table. The `Instance' option is not optional in this case. Check for the
* condition and inform the user. */
- if (is_table && (
vl->type_
instance == NULL))
+ if (is_table && (
xpath->
instance == NULL))
{
WARNING ("curl_xml plugin: "
"Base-XPath %s is a table (more than one result was returned), "
{
WARNING ("curl_xml plugin: "
"Base-XPath %s is a table (more than one result was returned), "
@@
-439,8
+441,12
@@
static int cx_handle_instance_xpath (xmlXPathContextPtr xpath_ctx, /* {{{ */
if (xpath->instance_prefix != NULL)
{
if (instance_node != NULL)
if (xpath->instance_prefix != NULL)
{
if (instance_node != NULL)
+ {
+ char *node_value = (char *) xmlNodeGetContent(instance_node->nodeTab[0]);
ssnprintf (vl->type_instance, sizeof (vl->type_instance),"%s%s",
ssnprintf (vl->type_instance, sizeof (vl->type_instance),"%s%s",
- xpath->instance_prefix, (char *) xmlNodeGetContent(instance_node->nodeTab[0]));
+ xpath->instance_prefix, node_value);
+ sfree (node_value);
+ }
else
sstrncpy (vl->type_instance, xpath->instance_prefix,
sizeof (vl->type_instance));
else
sstrncpy (vl->type_instance, xpath->instance_prefix,
sizeof (vl->type_instance));
@@
-450,8
+456,11
@@
static int cx_handle_instance_xpath (xmlXPathContextPtr xpath_ctx, /* {{{ */
/* If instance_prefix and instance_node are NULL, then
* don't set the type_instance */
if (instance_node != NULL)
/* If instance_prefix and instance_node are NULL, then
* don't set the type_instance */
if (instance_node != NULL)
- sstrncpy (vl->type_instance, (char *) xmlNodeGetContent(instance_node->nodeTab[0]),
- sizeof (vl->type_instance));
+ {
+ char *node_value = (char *) xmlNodeGetContent(instance_node->nodeTab[0]);
+ sstrncpy (vl->type_instance, node_value, sizeof (vl->type_instance));
+ sfree (node_value);
+ }
}
/* Free `instance_node_obj' this late, because `instance_node' points to
}
/* Free `instance_node_obj' this late, because `instance_node' points to
@@
-842,6
+851,8
@@
static int cx_init_curl (cx_t *db) /* {{{ */
curl_easy_setopt (db->curl, CURLOPT_USERAGENT, COLLECTD_USERAGENT);
curl_easy_setopt (db->curl, CURLOPT_ERRORBUFFER, db->curl_errbuf);
curl_easy_setopt (db->curl, CURLOPT_URL, db->url);
curl_easy_setopt (db->curl, CURLOPT_USERAGENT, COLLECTD_USERAGENT);
curl_easy_setopt (db->curl, CURLOPT_ERRORBUFFER, db->curl_errbuf);
curl_easy_setopt (db->curl, CURLOPT_URL, db->url);
+ curl_easy_setopt (db->curl, CURLOPT_FOLLOWLOCATION, 1L);
+ curl_easy_setopt (db->curl, CURLOPT_MAXREDIRS, 50L);
if (db->user != NULL)
{
if (db->user != NULL)
{
@@
-882,6
+893,14
@@
static int cx_init_curl (cx_t *db) /* {{{ */
if (db->post_body != NULL)
curl_easy_setopt (db->curl, CURLOPT_POSTFIELDS, db->post_body);
if (db->post_body != NULL)
curl_easy_setopt (db->curl, CURLOPT_POSTFIELDS, db->post_body);
+#ifdef HAVE_CURLOPT_TIMEOUT_MS
+ if (db->timeout >= 0)
+ curl_easy_setopt (db->curl, CURLOPT_TIMEOUT_MS, (long) db->timeout);
+ else
+ curl_easy_setopt (db->curl, CURLOPT_TIMEOUT_MS,
+ CDTIME_T_TO_MS(plugin_get_interval()));
+#endif
+
return (0);
} /* }}} int cx_init_curl */
return (0);
} /* }}} int cx_init_curl */
@@
-907,6
+926,8
@@
static int cx_config_add_url (oconfig_item_t *ci) /* {{{ */
}
memset (db, 0, sizeof (*db));
}
memset (db, 0, sizeof (*db));
+ db->timeout = -1;
+
if (strcasecmp ("URL", ci->key) == 0)
{
status = cf_util_get_string (ci, &db->url);
if (strcasecmp ("URL", ci->key) == 0)
{
status = cf_util_get_string (ci, &db->url);
@@
-920,6
+941,7
@@
static int cx_config_add_url (oconfig_item_t *ci) /* {{{ */
{
ERROR ("curl_xml plugin: cx_config: "
"Invalid key: %s", ci->key);
{
ERROR ("curl_xml plugin: cx_config: "
"Invalid key: %s", ci->key);
+ cx_free (db);
return (-1);
}
return (-1);
}
@@
-952,6
+974,8
@@
static int cx_config_add_url (oconfig_item_t *ci) /* {{{ */
status = cf_util_get_string (child, &db->post_body);
else if (strcasecmp ("Namespace", child->key) == 0)
status = cx_config_add_namespace (db, child);
status = cf_util_get_string (child, &db->post_body);
else if (strcasecmp ("Namespace", child->key) == 0)
status = cx_config_add_namespace (db, child);
+ else if (strcasecmp ("Timeout", child->key) == 0)
+ status = cf_util_get_int (child, &db->timeout);
else
{
WARNING ("curl_xml plugin: Option `%s' not allowed here.", child->key);
else
{
WARNING ("curl_xml plugin: Option `%s' not allowed here.", child->key);
@@
-1044,9
+1068,18
@@
static int cx_config (oconfig_item_t *ci) /* {{{ */
return (0);
} /* }}} int cx_config */
return (0);
} /* }}} int cx_config */
+static int cx_init (void) /* {{{ */
+{
+ /* Call this while collectd is still single-threaded to avoid
+ * initialization issues in libgcrypt. */
+ curl_global_init (CURL_GLOBAL_SSL);
+ return (0);
+} /* }}} int cx_init */
+
void module_register (void)
{
plugin_register_complex_config ("curl_xml", cx_config);
void module_register (void)
{
plugin_register_complex_config ("curl_xml", cx_config);
+ plugin_register_init ("curl_xml", cx_init);
} /* void module_register */
/* vim: set sw=2 sts=2 et fdm=marker : */
} /* void module_register */
/* vim: set sw=2 sts=2 et fdm=marker : */