#include "common.h"
#include "utils_cache.h"
#include "utils_parse_option.h"
+#include "utils_format_json.h"
#if HAVE_PTHREAD_H
# include <pthread.h>
/*
* Private variables
*/
-static const char *config_keys[] =
+struct wh_callback_s
{
- "URL", "User", "Password"
-};
-static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
+ char *location;
+
+ char *user;
+ char *pass;
+ char *credentials;
+ int verify_peer;
+ int verify_host;
+ char *cacert;
+ int store_rates;
-static char *location = NULL;
+#define WH_FORMAT_COMMAND 0
+#define WH_FORMAT_JSON 1
+ int format;
-char *user;
-char *pass;
-char *credentials;
+ CURL *curl;
+ char curl_errbuf[CURL_ERROR_SIZE];
-CURL *curl;
-char curl_errbuf[CURL_ERROR_SIZE];
+ char send_buffer[4096];
+ size_t send_buffer_free;
+ size_t send_buffer_fill;
+ time_t send_buffer_init_time;
+
+ pthread_mutex_t send_lock;
+};
+typedef struct wh_callback_s wh_callback_t;
-#define SEND_BUFFER_SIZE 4096
-static char send_buffer[SEND_BUFFER_SIZE];
-static size_t send_buffer_free;
-static size_t send_buffer_fill;
-static time_t send_buffer_init_time;
+static void wh_reset_buffer (wh_callback_t *cb) /* {{{ */
+{
+ memset (cb->send_buffer, 0, sizeof (cb->send_buffer));
+ cb->send_buffer_free = sizeof (cb->send_buffer);
+ cb->send_buffer_fill = 0;
+ cb->send_buffer_init_time = time (NULL);
-static pthread_mutex_t send_lock = PTHREAD_MUTEX_INITIALIZER;
+ if (cb->format == WH_FORMAT_JSON)
+ {
+ format_json_initialize (cb->send_buffer,
+ &cb->send_buffer_fill,
+ &cb->send_buffer_free);
+ }
+} /* }}} wh_reset_buffer */
-static void wh_init_buffer (void) /* {{{ */
+static int wh_send_buffer (wh_callback_t *cb) /* {{{ */
{
- memset (send_buffer, 0, sizeof (send_buffer));
- send_buffer_free = sizeof (send_buffer);
- send_buffer_fill = 0;
- send_buffer_init_time = time (NULL);
-} /* }}} wh_init_buffer */
+ int status = 0;
-static int wh_init(void) /* {{{ */
+ curl_easy_setopt (cb->curl, CURLOPT_POSTFIELDS, cb->send_buffer);
+ status = curl_easy_perform (cb->curl);
+ if (status != 0)
+ {
+ ERROR ("write_http plugin: curl_easy_perform failed with "
+ "status %i: %s",
+ status, cb->curl_errbuf);
+ }
+ return (status);
+} /* }}} wh_send_buffer */
+
+static int wh_callback_init (wh_callback_t *cb) /* {{{ */
{
+ struct curl_slist *headers;
- curl = curl_easy_init ();
+ if (cb->curl != NULL)
+ return (0);
- if (curl == NULL)
+ cb->curl = curl_easy_init ();
+ if (cb->curl == NULL)
{
ERROR ("curl plugin: curl_easy_init failed.");
return (-1);
}
- struct curl_slist *headers=NULL;
+ curl_easy_setopt (cb->curl, CURLOPT_NOSIGNAL, 1);
+ curl_easy_setopt (cb->curl, CURLOPT_USERAGENT, PACKAGE_NAME"/"PACKAGE_VERSION);
- curl_easy_setopt (curl, CURLOPT_USERAGENT, PACKAGE_NAME"/"PACKAGE_VERSION);
-
- headers = curl_slist_append(headers, "Accept: */*");
- headers = curl_slist_append(headers, "Content-Type: text/plain");
- curl_easy_setopt (curl, CURLOPT_HTTPHEADER, headers);
+ headers = NULL;
+ headers = curl_slist_append (headers, "Accept: */*");
+ if (cb->format == WH_FORMAT_JSON)
+ headers = curl_slist_append (headers, "Content-Type: application/json");
+ else
+ headers = curl_slist_append (headers, "Content-Type: text/plain");
+ headers = curl_slist_append (headers, "Expect:");
+ curl_easy_setopt (cb->curl, CURLOPT_HTTPHEADER, headers);
- curl_easy_setopt (curl, CURLOPT_ERRORBUFFER, curl_errbuf);
- curl_easy_setopt (curl, CURLOPT_URL, location);
+ curl_easy_setopt (cb->curl, CURLOPT_ERRORBUFFER, cb->curl_errbuf);
+ curl_easy_setopt (cb->curl, CURLOPT_URL, cb->location);
- if (user != NULL)
+ if (cb->user != NULL)
{
size_t credentials_size;
- credentials_size = strlen (user) + 2;
- if (pass != NULL)
- credentials_size += strlen (pass);
+ credentials_size = strlen (cb->user) + 2;
+ if (cb->pass != NULL)
+ credentials_size += strlen (cb->pass);
- credentials = (char *) malloc (credentials_size);
- if (credentials == NULL)
+ cb->credentials = (char *) malloc (credentials_size);
+ if (cb->credentials == NULL)
{
ERROR ("curl plugin: malloc failed.");
return (-1);
}
- ssnprintf (credentials, credentials_size, "%s:%s",
- user, (pass == NULL) ? "" : pass);
- curl_easy_setopt (curl, CURLOPT_USERPWD, credentials);
- curl_easy_setopt (curl, CURLOPT_HTTPAUTH, CURLAUTH_DIGEST);
+ ssnprintf (cb->credentials, credentials_size, "%s:%s",
+ cb->user, (cb->pass == NULL) ? "" : cb->pass);
+ curl_easy_setopt (cb->curl, CURLOPT_USERPWD, cb->credentials);
+ curl_easy_setopt (cb->curl, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
}
- wh_init_buffer ();
+ curl_easy_setopt (cb->curl, CURLOPT_SSL_VERIFYPEER, cb->verify_peer);
+ curl_easy_setopt (cb->curl, CURLOPT_SSL_VERIFYHOST,
+ cb->verify_host ? 2 : 0);
+ if (cb->cacert != NULL)
+ curl_easy_setopt (cb->curl, CURLOPT_CAINFO, cb->cacert);
+
+ wh_reset_buffer (cb);
return (0);
-} /* }}} */
+} /* }}} int wh_callback_init */
-static int wh_value_list_to_string (char *buffer, /* {{{ */
- size_t buffer_size,
- const data_set_t *ds, const value_list_t *vl)
+static int wh_flush_nolock (int timeout, wh_callback_t *cb) /* {{{ */
{
- size_t offset = 0;
int status;
- int i;
-
- assert (0 == strcmp (ds->type, vl->type));
-
- memset (buffer, 0, buffer_size);
-
-#define BUFFER_ADD(...) do { \
- status = ssnprintf (buffer + offset, buffer_size - offset, \
- __VA_ARGS__); \
- if (status < 1) \
- return (-1); \
- else if (((size_t) status) >= (buffer_size - offset)) \
- return (-1); \
- else \
- offset += ((size_t) status); \
-} while (0)
- BUFFER_ADD ("%lu", (unsigned long) vl->time);
+ DEBUG ("write_http plugin: wh_flush_nolock: timeout = %i; "
+ "send_buffer_fill = %zu;",
+ timeout, cb->send_buffer_fill);
- for (i = 0; i < ds->ds_num; i++)
-{
- if (ds->ds[i].type == DS_TYPE_GAUGE)
- BUFFER_ADD (":%f", vl->values[i].gauge);
- else if (ds->ds[i].type == DS_TYPE_COUNTER)
- BUFFER_ADD (":%llu", vl->values[i].counter);
- else if (ds->ds[i].type == DS_TYPE_DERIVE)
- BUFFER_ADD (":%"PRIi64, vl->values[i].derive);
- else if (ds->ds[i].type == DS_TYPE_ABSOLUTE)
- BUFFER_ADD (":%"PRIu64, vl->values[i].absolute);
- else
+ if (timeout > 0)
{
- ERROR ("write_http plugin: Unknown data source type: %i",
- ds->ds[i].type);
- return (-1);
- }
-} /* for ds->ds_num */
-
-#undef BUFFER_ADD
+ time_t now;
-return (0);
-} /* }}} int wh_value_list_to_string */
+ now = time (NULL);
+ if ((cb->send_buffer_init_time + timeout) > now)
+ return (0);
+ }
-static int wh_config (const char *key, const char *value) /* {{{ */
-{
- if (strcasecmp ("URL", key) == 0)
+ if (cb->format == WH_FORMAT_COMMAND)
{
- if (location != NULL)
- free (location);
- location = strdup (value);
- if (location != NULL)
+ if (cb->send_buffer_fill <= 0)
{
- int len = strlen (location);
- while ((len > 0) && (location[len - 1] == '/'))
- {
- len--;
- location[len] = '\0';
- }
- if (len <= 0)
- {
- free (location);
- location = NULL;
- }
+ cb->send_buffer_init_time = time (NULL);
+ return (0);
}
+
+ status = wh_send_buffer (cb);
+ wh_reset_buffer (cb);
}
- else if (strcasecmp ("User", key) == 0)
+ else if (cb->format == WH_FORMAT_JSON)
{
- if (user != NULL)
- free (user);
- user = strdup (value);
- if (user != NULL)
+ if (cb->send_buffer_fill <= 2)
{
- int len = strlen (user);
- while ((len > 0) && (user[len - 1] == '/'))
- {
- len--;
- user[len] = '\0';
- }
- if (len <= 0)
- {
- free (user);
- user = NULL;
- }
+ cb->send_buffer_init_time = time (NULL);
+ return (0);
}
- }
- else if (strcasecmp ("Password", key) == 0)
- {
- if (pass != NULL)
- free (pass);
- pass = strdup (value);
- if (pass != NULL)
+
+ status = format_json_finalize (cb->send_buffer,
+ &cb->send_buffer_fill,
+ &cb->send_buffer_free);
+ if (status != 0)
{
- int len = strlen (pass);
- while ((len > 0) && (pass[len - 1] == '/'))
- {
- len--;
- pass[len] = '\0';
- }
- if (len <= 0)
- {
- free (pass);
- pass = NULL;
- }
+ ERROR ("write_http: wh_flush_nolock: "
+ "format_json_finalize failed.");
+ wh_reset_buffer (cb);
+ return (status);
}
+
+ status = wh_send_buffer (cb);
+ wh_reset_buffer (cb);
}
else
{
+ ERROR ("write_http: wh_flush_nolock: "
+ "Unknown format: %i",
+ cb->format);
return (-1);
}
- return (0);
-} /* }}} int wh_config */
-static int wh_send_buffer (char *buffer) /* {{{ */
-{
- int status = 0;
-
- curl_easy_setopt (curl, CURLOPT_POSTFIELDS, buffer);
- status = curl_easy_perform (curl);
- if (status != 0)
- {
- ERROR ("write_http plugin: curl_easy_perform failed with "
- "staus %i: %s",
- status, curl_errbuf);
- }
return (status);
-} /* }}} wh_send_buffer */
+} /* }}} wh_flush_nolock */
-static int wh_flush_nolock (int timeout) /* {{{ */
+static int wh_flush (int timeout, /* {{{ */
+ const char *identifier __attribute__((unused)),
+ user_data_t *user_data)
{
+ wh_callback_t *cb;
int status;
- DEBUG ("write_http plugin: wh_flush_nolock: timeout = %i; "
- "send_buffer =\n %s", timeout, send_buffer);
+ if (user_data == NULL)
+ return (-EINVAL);
- if (timeout > 0)
- {
- time_t now;
+ cb = user_data->data;
- now = time (NULL);
- if ((send_buffer_init_time + timeout) > now)
- return (0);
- }
+ pthread_mutex_lock (&cb->send_lock);
- if (send_buffer_fill <= 0)
+ if (cb->curl == NULL)
{
- send_buffer_init_time = time (NULL);
- return (0);
+ status = wh_callback_init (cb);
+ if (status != 0)
+ {
+ ERROR ("write_http plugin: wh_callback_init failed.");
+ pthread_mutex_unlock (&cb->send_lock);
+ return (-1);
+ }
}
- status = wh_send_buffer (send_buffer);
- wh_init_buffer ();
+ status = wh_flush_nolock (timeout, cb);
+ pthread_mutex_unlock (&cb->send_lock);
return (status);
-} /* }}} wh_flush_nolock */
+} /* }}} int wh_flush */
-static int wh_flush (int timeout, /* {{{ */
- const char *identifier __attribute__((unused)),
- user_data_t *user_data __attribute__((unused)))
+static void wh_callback_free (void *data) /* {{{ */
{
+ wh_callback_t *cb;
+
+ if (data == NULL)
+ return;
+
+ cb = data;
+
+ wh_flush_nolock (/* timeout = */ -1, cb);
+
+ curl_easy_cleanup (cb->curl);
+ sfree (cb->location);
+ sfree (cb->user);
+ sfree (cb->pass);
+ sfree (cb->credentials);
+ sfree (cb->cacert);
+
+ sfree (cb);
+} /* }}} void wh_callback_free */
+
+static int wh_value_list_to_string (char *buffer, /* {{{ */
+ size_t buffer_size,
+ const data_set_t *ds, const value_list_t *vl,
+ wh_callback_t *cb)
+{
+ size_t offset = 0;
int status;
+ int i;
+ gauge_t *rates = NULL;
- pthread_mutex_lock (&send_lock);
- status = wh_flush_nolock (timeout);
- pthread_mutex_unlock (&send_lock);
+ assert (0 == strcmp (ds->type, vl->type));
- return (status);
-} /* }}} int wh_flush */
+ memset (buffer, 0, buffer_size);
-static int wh_write_command (const data_set_t *ds, const value_list_t *vl) /* {{{ */
+#define BUFFER_ADD(...) do { \
+ status = ssnprintf (buffer + offset, buffer_size - offset, \
+ __VA_ARGS__); \
+ if (status < 1) \
+ { \
+ sfree (rates); \
+ return (-1); \
+ } \
+ else if (((size_t) status) >= (buffer_size - offset)) \
+ { \
+ sfree (rates); \
+ return (-1); \
+ } \
+ else \
+ offset += ((size_t) status); \
+} while (0)
+
+ BUFFER_ADD ("%lu", (unsigned long) vl->time);
+
+ for (i = 0; i < ds->ds_num; i++)
+ {
+ if (ds->ds[i].type == DS_TYPE_GAUGE)
+ BUFFER_ADD (":%f", vl->values[i].gauge);
+ else if (cb->store_rates)
+ {
+ if (rates == NULL)
+ rates = uc_get_rate (ds, vl);
+ if (rates == NULL)
+ {
+ WARNING ("write_http plugin: "
+ "uc_get_rate failed.");
+ return (-1);
+ }
+ BUFFER_ADD (":%g", rates[i]);
+ }
+ else if (ds->ds[i].type == DS_TYPE_COUNTER)
+ BUFFER_ADD (":%llu", vl->values[i].counter);
+ else if (ds->ds[i].type == DS_TYPE_DERIVE)
+ BUFFER_ADD (":%"PRIi64, vl->values[i].derive);
+ else if (ds->ds[i].type == DS_TYPE_ABSOLUTE)
+ BUFFER_ADD (":%"PRIu64, vl->values[i].absolute);
+ else
+ {
+ ERROR ("write_http plugin: Unknown data source type: %i",
+ ds->ds[i].type);
+ sfree (rates);
+ return (-1);
+ }
+ } /* for ds->ds_num */
+
+#undef BUFFER_ADD
+
+ sfree (rates);
+ return (0);
+} /* }}} int wh_value_list_to_string */
+
+static int wh_write_command (const data_set_t *ds, const value_list_t *vl, /* {{{ */
+ wh_callback_t *cb)
{
char key[10*DATA_MAX_NAME_LEN];
char values[512];
/* Convert the values to an ASCII representation and put that into
* `values'. */
- status = wh_value_list_to_string (values, sizeof (values), ds, vl);
+ status = wh_value_list_to_string (values, sizeof (values), ds, vl, cb);
if (status != 0) {
ERROR ("write_http plugin: error with "
"wh_value_list_to_string");
}
command_len = (size_t) ssnprintf (command, sizeof (command),
- "PUTVAL %s interval=%i %s\n",
+ "PUTVAL %s interval=%i %s\r\n",
key, vl->interval, values);
if (command_len >= sizeof (command)) {
ERROR ("write_http plugin: Command buffer too small: "
return (-1);
}
- pthread_mutex_lock (&send_lock);
+ pthread_mutex_lock (&cb->send_lock);
- /* Check if we have enough space for this command. */
- if (command_len >= send_buffer_free)
+ if (cb->curl == NULL)
{
- status = wh_flush_nolock (/* timeout = */ -1);
+ status = wh_callback_init (cb);
if (status != 0)
{
- pthread_mutex_unlock (&send_lock);
- return status;
+ ERROR ("write_http plugin: wh_callback_init failed.");
+ pthread_mutex_unlock (&cb->send_lock);
+ return (-1);
}
}
- assert (command_len < send_buffer_free);
+
+ if (command_len >= cb->send_buffer_free)
+ {
+ status = wh_flush_nolock (/* timeout = */ -1, cb);
+ if (status != 0)
+ {
+ pthread_mutex_unlock (&cb->send_lock);
+ return (status);
+ }
+ }
+ assert (command_len < cb->send_buffer_free);
/* `command_len + 1' because `command_len' does not include the
* trailing null byte. Neither does `send_buffer_fill'. */
- memcpy (send_buffer + send_buffer_fill, command, command_len + 1);
- send_buffer_fill += command_len;
- send_buffer_free -= command_len;
+ memcpy (cb->send_buffer + cb->send_buffer_fill,
+ command, command_len + 1);
+ cb->send_buffer_fill += command_len;
+ cb->send_buffer_free -= command_len;
+
+ DEBUG ("write_http plugin: <%s> buffer %zu/%zu (%g%%) \"%s\"",
+ cb->location,
+ cb->send_buffer_fill, sizeof (cb->send_buffer),
+ 100.0 * ((double) cb->send_buffer_fill) / ((double) sizeof (cb->send_buffer)),
+ command);
- pthread_mutex_unlock (&send_lock);
+ /* Check if we have enough space for this command. */
+ pthread_mutex_unlock (&cb->send_lock);
return (0);
} /* }}} int wh_write_command */
+static int wh_write_json (const data_set_t *ds, const value_list_t *vl, /* {{{ */
+ wh_callback_t *cb)
+{
+ int status;
+
+ pthread_mutex_lock (&cb->send_lock);
+
+ if (cb->curl == NULL)
+ {
+ status = wh_callback_init (cb);
+ if (status != 0)
+ {
+ ERROR ("write_http plugin: wh_callback_init failed.");
+ pthread_mutex_unlock (&cb->send_lock);
+ return (-1);
+ }
+ }
+
+ status = format_json_value_list (cb->send_buffer,
+ &cb->send_buffer_fill,
+ &cb->send_buffer_free,
+ ds, vl, cb->store_rates);
+ if (status == (-ENOMEM))
+ {
+ status = wh_flush_nolock (/* timeout = */ -1, cb);
+ if (status != 0)
+ {
+ wh_reset_buffer (cb);
+ pthread_mutex_unlock (&cb->send_lock);
+ return (status);
+ }
+
+ status = format_json_value_list (cb->send_buffer,
+ &cb->send_buffer_fill,
+ &cb->send_buffer_free,
+ ds, vl, cb->store_rates);
+ }
+ if (status != 0)
+ {
+ pthread_mutex_unlock (&cb->send_lock);
+ return (status);
+ }
+
+ DEBUG ("write_http plugin: <%s> buffer %zu/%zu (%g%%)",
+ cb->location,
+ cb->send_buffer_fill, sizeof (cb->send_buffer),
+ 100.0 * ((double) cb->send_buffer_fill) / ((double) sizeof (cb->send_buffer)));
+
+ /* Check if we have enough space for this command. */
+ pthread_mutex_unlock (&cb->send_lock);
+
+ return (0);
+} /* }}} int wh_write_json */
+
static int wh_write (const data_set_t *ds, const value_list_t *vl, /* {{{ */
- user_data_t __attribute__((unused)) *user_data)
+ user_data_t *user_data)
{
+ wh_callback_t *cb;
int status;
- status = wh_write_command (ds, vl);
+ if (user_data == NULL)
+ return (-EINVAL);
+
+ cb = user_data->data;
+
+ if (cb->format == WH_FORMAT_JSON)
+ status = wh_write_json (ds, vl, cb);
+ else
+ status = wh_write_command (ds, vl, cb);
return (status);
} /* }}} int wh_write */
-static int wh_shutdown (void) /* {{{ */
+static int config_set_string (char **ret_string, /* {{{ */
+ oconfig_item_t *ci)
{
- wh_flush_nolock (/* timeout = */ -1);
- curl_easy_cleanup(curl);
+ char *string;
+
+ if ((ci->values_num != 1)
+ || (ci->values[0].type != OCONFIG_TYPE_STRING))
+ {
+ WARNING ("write_http plugin: The `%s' config option "
+ "needs exactly one string argument.", ci->key);
+ return (-1);
+ }
+
+ string = strdup (ci->values[0].value.string);
+ if (string == NULL)
+ {
+ ERROR ("write_http plugin: strdup failed.");
+ return (-1);
+ }
+
+ if (*ret_string != NULL)
+ free (*ret_string);
+ *ret_string = string;
+
+ return (0);
+} /* }}} int config_set_string */
+
+static int config_set_boolean (int *dest, oconfig_item_t *ci) /* {{{ */
+{
+ if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_BOOLEAN))
+ {
+ WARNING ("write_http plugin: The `%s' config option "
+ "needs exactly one boolean argument.", ci->key);
+ return (-1);
+ }
+
+ *dest = ci->values[0].value.boolean ? 1 : 0;
+
+ return (0);
+} /* }}} int config_set_boolean */
+
+static int config_set_format (wh_callback_t *cb, /* {{{ */
+ oconfig_item_t *ci)
+{
+ char *string;
+
+ if ((ci->values_num != 1)
+ || (ci->values[0].type != OCONFIG_TYPE_STRING))
+ {
+ WARNING ("write_http plugin: The `%s' config option "
+ "needs exactly one string argument.", ci->key);
+ return (-1);
+ }
+
+ string = ci->values[0].value.string;
+ if (strcasecmp ("Command", string) == 0)
+ cb->format = WH_FORMAT_COMMAND;
+ else if (strcasecmp ("JSON", string) == 0)
+ cb->format = WH_FORMAT_JSON;
+ else
+ {
+ ERROR ("write_http plugin: Invalid format string: %s",
+ string);
+ return (-1);
+ }
+
return (0);
-} /* }}} int wh_shutdown */
+} /* }}} int config_set_string */
+
+static int wh_config_url (oconfig_item_t *ci) /* {{{ */
+{
+ wh_callback_t *cb;
+ user_data_t user_data;
+ int i;
+
+ cb = malloc (sizeof (*cb));
+ if (cb == NULL)
+ {
+ ERROR ("write_http plugin: malloc failed.");
+ return (-1);
+ }
+ memset (cb, 0, sizeof (*cb));
+ cb->location = NULL;
+ cb->user = NULL;
+ cb->pass = NULL;
+ cb->credentials = NULL;
+ cb->verify_peer = 1;
+ cb->verify_host = 1;
+ cb->cacert = NULL;
+ cb->format = WH_FORMAT_COMMAND;
+ cb->curl = NULL;
+
+ pthread_mutex_init (&cb->send_lock, /* attr = */ NULL);
+
+ config_set_string (&cb->location, ci);
+ if (cb->location == NULL)
+ return (-1);
+
+ for (i = 0; i < ci->children_num; i++)
+ {
+ oconfig_item_t *child = ci->children + i;
+
+ if (strcasecmp ("User", child->key) == 0)
+ config_set_string (&cb->user, child);
+ else if (strcasecmp ("Password", child->key) == 0)
+ config_set_string (&cb->pass, child);
+ else if (strcasecmp ("VerifyPeer", child->key) == 0)
+ config_set_boolean (&cb->verify_peer, child);
+ else if (strcasecmp ("VerifyHost", child->key) == 0)
+ config_set_boolean (&cb->verify_host, child);
+ else if (strcasecmp ("CACert", child->key) == 0)
+ config_set_string (&cb->cacert, child);
+ else if (strcasecmp ("Format", child->key) == 0)
+ config_set_format (cb, child);
+ else if (strcasecmp ("StoreRates", child->key) == 0)
+ config_set_boolean (&cb->store_rates, child);
+ else
+ {
+ ERROR ("write_http plugin: Invalid configuration "
+ "option: %s.", child->key);
+ }
+ }
+
+ DEBUG ("write_http: Registering write callback with URL %s",
+ 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);
+
+ user_data.free_func = wh_callback_free;
+ plugin_register_write ("write_http", wh_write, &user_data);
+
+ return (0);
+} /* }}} int wh_config_url */
+
+static int wh_config (oconfig_item_t *ci) /* {{{ */
+{
+ int i;
+
+ for (i = 0; i < ci->children_num; i++)
+ {
+ oconfig_item_t *child = ci->children + i;
+
+ if (strcasecmp ("URL", child->key) == 0)
+ wh_config_url (child);
+ else
+ {
+ ERROR ("write_http plugin: Invalid configuration "
+ "option: %s.", child->key);
+ }
+ }
+
+ return (0);
+} /* }}} int wh_config */
void module_register (void) /* {{{ */
{
- plugin_register_init("write_http", wh_init);
- plugin_register_config ("write_http", wh_config,
- config_keys, config_keys_num);
- plugin_register_write ("write_http", wh_write, /* user_data = */ NULL);
- plugin_register_flush ("write_http", wh_flush, /* user_data = */ NULL);
- plugin_register_shutdown("write_http", wh_shutdown);
+ plugin_register_complex_config ("write_http", wh_config);
} /* }}} void module_register */
/* vim: set fdm=marker sw=8 ts=8 tw=78 et : */
projects / collectd.git / blobdiff