#include "plugin.h"
#include "common.h"
#include "configfile.h"
+#include "utils_cache.h"
#include "riemann.pb-c.h"
#include <sys/socket.h>
#include <pthread.h>
#define RIEMANN_DELAY 1
-#define RIEMANN_PORT 5555
+#define RIEMANN_PORT "5555"
#define RIEMANN_MAX_TAGS 37
#define RIEMANN_EXTRA_TAGS 32
struct riemann_host {
#define F_CONNECT 0x01
- u_int8_t flags;
+ uint8_t flags;
pthread_mutex_t lock;
int delay;
- char name[DATA_MAX_NAME_LEN];
- int port;
+ _Bool store_rates;
+ char *node;
+ char *service;
int s;
-};
-struct riemann_event {
- Event ev;
- char service[DATA_MAX_NAME_LEN];
- const char *tags[RIEMANN_MAX_TAGS];
+ int reference_count;
};
-char *riemann_tags[RIEMANN_EXTRA_TAGS];
-int riemann_tagcount;
-
-int riemann_send(struct riemann_host *, Msg const *);
-int riemann_notification(const notification_t *, user_data_t *);
-int riemann_write(const data_set_t *, const value_list_t *, user_data_t *);
-int riemann_connect(struct riemann_host *);
-int riemann_disconnect (struct riemann_host *host);
-void riemann_free(void *);
-int riemann_config_host(oconfig_item_t *);
-int riemann_config(oconfig_item_t *);
+static char **riemann_tags;
+static size_t riemann_tags_num;
+
+static int riemann_send(struct riemann_host *, Msg const *);
+static int riemann_notification(const notification_t *, user_data_t *);
+static int riemann_write(const data_set_t *, const value_list_t *, user_data_t *);
+static int riemann_connect(struct riemann_host *);
+static int riemann_disconnect (struct riemann_host *host);
+static void riemann_free(void *);
+static int riemann_config_host(oconfig_item_t *);
+static int riemann_config(oconfig_item_t *);
void module_register(void);
-int
+static void riemann_event_protobuf_free (Event *event) /* {{{ */
+{
+ if (event == NULL)
+ return;
+
+ sfree (event->state);
+ sfree (event->service);
+ sfree (event->host);
+ sfree (event->description);
+
+ strarray_free (event->tags, event->n_tags);
+ event->tags = NULL;
+ event->n_tags = 0;
+
+ sfree (event);
+} /* }}} void riemann_event_protobuf_free */
+
+static void riemann_msg_protobuf_free (Msg *msg) /* {{{ */
+{
+ size_t i;
+
+ if (msg == NULL)
+ return;
+
+ for (i = 0; i < msg->n_events; i++)
+ {
+ riemann_event_protobuf_free (msg->events[i]);
+ msg->events[i] = NULL;
+ }
+
+ sfree (msg->events);
+ msg->n_events = 0;
+
+ sfree (msg);
+} /* }}} void riemann_msg_protobuf_free */
+
+static int
riemann_send(struct riemann_host *host, Msg const *msg)
{
u_char *buffer;
size_t buffer_len;
- ssize_t status;
+ int status;
+
+ pthread_mutex_lock (&host->lock);
+
+ status = riemann_connect (host);
+ if (status != 0)
+ {
+ pthread_mutex_unlock (&host->lock);
+ return status;
+ }
buffer_len = msg__get_packed_size(msg);
buffer = malloc (buffer_len);
if (buffer == NULL) {
+ pthread_mutex_unlock (&host->lock);
ERROR ("riemann plugin: malloc failed.");
return ENOMEM;
}
msg__pack(msg, buffer);
- status = swrite (host->s, buffer, buffer_len);
+ status = (int) swrite (host->s, buffer, buffer_len);
if (status != 0)
{
char errbuf[1024];
- ERROR ("riemann plugin: Sending to Riemann at %s:%d failed: %s",
- host->name, host->port,
- sstrerror (errno, errbuf, sizeof (errbuf)));
+
riemann_disconnect (host);
+ pthread_mutex_unlock (&host->lock);
+
+ ERROR ("riemann plugin: Sending to Riemann at %s:%s failed: %s",
+ host->node,
+ (host->service != NULL) ? host->service : RIEMANN_PORT,
+ sstrerror (errno, errbuf, sizeof (errbuf)));
sfree (buffer);
return -1;
}
+ pthread_mutex_unlock (&host->lock);
sfree (buffer);
return 0;
}
-int
-riemann_notification(const notification_t *n, user_data_t *ud)
+static int riemann_event_add_tag (Event *event, /* {{{ */
+ char const *format, ...)
{
- int i;
- struct riemann_host *host = ud->data;
- Msg msg = MSG__INIT;
- Event ev = EVENT__INIT;
- Event *evtab[1];
- const char *tags[RIEMANN_MAX_TAGS];
- char service[DATA_MAX_NAME_LEN];
- notification_meta_t *meta;
- struct {
- int code;
- char *name;
- } severities[] = {
- { NOTIF_OKAY, "ok" },
- { NOTIF_WARNING, "warning" },
- { NOTIF_FAILURE, "critical" },
- { -1, "unknown" }
- };
-
- evtab[0] = &ev;
- msg.n_events = 1;
- msg.events = evtab;
-
- ev.host = host->name;
- ev.time = CDTIME_T_TO_TIME_T(n->time);
- ev.has_time = 1;
-
- for (i = 0;
- severities[i].code > 0 && severities[i].code != n->severity;
- i++)
- ;
- ev.state = severities[i].name;
-
- ev.n_tags = 2;
- ev.tags = (char **)tags;
- tags[0] = n->plugin;
- tags[1] = "notification";
-
- for (i = 0; i < riemann_tagcount; i++)
- tags[ev.n_tags++] = riemann_tags[i];
-
- ssnprintf(service, sizeof(service),
- "%s-%s-%s-%s", n->plugin, n->plugin_instance,
- n->type, n->type_instance);
- ev.service = service;
- ev.description = (char *)n->message;
-
- /*
- * Pull in values from threshold
- */
- for (meta = n->meta;
- meta != NULL && strcasecmp(meta->name, "CurrentValue") != 0;
- meta = meta->next)
- ;
-
- if (meta != NULL) {
- ev.has_metric_d = 1;
- ev.metric_d = meta->nm_value.nm_double;
+ va_list ap;
+ char buffer[1024];
+ size_t ret;
+
+ va_start (ap, format);
+ ret = vsnprintf (buffer, sizeof (buffer), format, ap);
+ if (ret >= sizeof (buffer))
+ ret = sizeof (buffer) - 1;
+ buffer[ret] = 0;
+ va_end (ap);
+
+ return (strarray_add (&event->tags, &event->n_tags, buffer));
+} /* }}} int riemann_event_add_tag */
+
+static Msg *riemann_notification_to_protobuf (struct riemann_host *host, /* {{{ */
+ notification_t const *n)
+{
+ Msg *msg;
+ Event *event;
+ char service_buffer[6 * DATA_MAX_NAME_LEN];
+ char const *severity;
+ notification_meta_t *meta;
+ int i;
+
+ msg = malloc (sizeof (*msg));
+ if (msg == NULL)
+ {
+ ERROR ("riemann plugin: malloc failed.");
+ return (NULL);
}
+ memset (msg, 0, sizeof (*msg));
+ msg__init (msg);
- return riemann_send(host, &msg);
-}
+ msg->events = malloc (sizeof (*msg->events));
+ if (msg->events == NULL)
+ {
+ ERROR ("riemann plugin: malloc failed.");
+ sfree (msg);
+ return (NULL);
+ }
-int
-riemann_write(const data_set_t *ds,
- const value_list_t *vl,
- user_data_t *ud)
+ event = malloc (sizeof (*event));
+ if (event == NULL)
+ {
+ ERROR ("riemann plugin: malloc failed.");
+ sfree (msg->events);
+ sfree (msg);
+ return (NULL);
+ }
+ memset (event, 0, sizeof (*event));
+ event__init (event);
+
+ msg->events[0] = event;
+ msg->n_events = 1;
+
+ event->host = strdup (n->host);
+ event->time = CDTIME_T_TO_TIME_T (n->time);
+ event->has_time = 1;
+
+ switch (n->severity)
+ {
+ case NOTIF_OKAY: severity = "okay"; break;
+ case NOTIF_WARNING: severity = "warning"; break;
+ case NOTIF_FAILURE: severity = "failure"; break;
+ default: severity = "unknown";
+ }
+ event->state = strdup (severity);
+
+ riemann_event_add_tag (event, "notification");
+ if (n->plugin[0] != 0)
+ riemann_event_add_tag (event, "plugin:%s", n->plugin);
+ if (n->plugin_instance[0] != 0)
+ riemann_event_add_tag (event, "plugin_instance:%s",
+ n->plugin_instance);
+
+ if (n->type[0] != 0)
+ riemann_event_add_tag (event, "type:%s", n->type);
+ if (n->type_instance[0] != 0)
+ riemann_event_add_tag (event, "type_instance:%s",
+ n->type_instance);
+
+ for (i = 0; i < riemann_tags_num; i++)
+ riemann_event_add_tag (event, "%s", riemann_tags[i]);
+
+ /* TODO: Use FORMAT_VL() here. */
+ ssnprintf (service_buffer, sizeof(service_buffer),
+ "%s-%s-%s-%s", n->plugin, n->plugin_instance,
+ n->type, n->type_instance);
+ event->service = strdup (service_buffer);
+
+ /* Pull in values from threshold */
+ for (meta = n->meta; meta != NULL; meta = meta->next)
+ {
+ if (strcasecmp ("CurrentValue", meta->name) != 0)
+ continue;
+
+ event->metric_d = meta->nm_value.nm_double;
+ event->has_metric_d = 1;
+ break;
+ }
+
+ DEBUG ("riemann plugin: Successfully created protobuf for notification: "
+ "host = \"%s\", service = \"%s\", state = \"%s\"",
+ event->host, event->service, event->state);
+ return (msg);
+} /* }}} Msg *riemann_notification_to_protobuf */
+
+static Event *riemann_value_to_protobuf (struct riemann_host const *host, /* {{{ */
+ data_set_t const *ds,
+ value_list_t const *vl, size_t index,
+ gauge_t const *rates)
{
- int i, j;
- int status;
- struct riemann_host *host = ud->data;
- Msg msg = MSG__INIT;
- Event *ev;
- struct riemann_event *event_tab, *event;
+ Event *event;
+ char service_buffer[6 * DATA_MAX_NAME_LEN];
+ int i;
- if ((status = riemann_connect(host)) != 0)
- return status;
+ event = malloc (sizeof (*event));
+ if (event == NULL)
+ {
+ ERROR ("riemann plugin: malloc failed.");
+ return (NULL);
+ }
+ memset (event, 0, sizeof (*event));
+ event__init (event);
+
+ event->host = strdup (vl->host);
+ event->time = CDTIME_T_TO_TIME_T (vl->time);
+ event->has_time = 1;
+ event->ttl = CDTIME_T_TO_TIME_T (vl->interval) + host->delay;
+ event->has_ttl = 1;
+
+ riemann_event_add_tag (event, "plugin:%s", vl->plugin);
+ if (vl->plugin_instance[0] != 0)
+ riemann_event_add_tag (event, "plugin_instance:%s",
+ vl->plugin_instance);
+
+ riemann_event_add_tag (event, "type:%s", vl->type);
+ if (vl->type_instance[0] != 0)
+ riemann_event_add_tag (event, "type_instance:%s",
+ vl->type_instance);
+
+ if ((ds->ds[index].type != DS_TYPE_GAUGE) && (rates != NULL))
+ {
+ riemann_event_add_tag (event, "ds_type:%s:rate",
+ DS_TYPE_TO_STRING(ds->ds[index].type));
+ }
+ else
+ {
+ riemann_event_add_tag (event, "ds_type:%s",
+ DS_TYPE_TO_STRING(ds->ds[index].type));
+ }
+ riemann_event_add_tag (event, "ds_name:%s", ds->ds[index].name);
+ riemann_event_add_tag (event, "ds_index:%zu", index);
- msg.n_events = vl->values_len;
+ for (i = 0; i < riemann_tags_num; i++)
+ riemann_event_add_tag (event, "%s", riemann_tags[i]);
- /*
- * Get rid of allocations up front
- */
- if ((msg.events = calloc(msg.n_events, sizeof(*msg.events))) == NULL ||
- (event_tab = calloc(msg.n_events, sizeof(*event_tab))) == NULL) {
- free(msg.events);
- free(event_tab);
- return ENOMEM;
+ if (ds->ds[index].type == DS_TYPE_GAUGE)
+ {
+ event->has_metric_d = 1;
+ event->metric_d = (double) vl->values[index].gauge;
+ }
+ else if (rates != NULL)
+ {
+ event->has_metric_d = 1;
+ event->metric_d = (double) rates[index];
+ }
+ else
+ {
+ event->has_metric_sint64 = 1;
+ if (ds->ds[index].type == DS_TYPE_DERIVE)
+ event->metric_sint64 = (int64_t) vl->values[index].derive;
+ else if (ds->ds[index].type == DS_TYPE_ABSOLUTE)
+ event->metric_sint64 = (int64_t) vl->values[index].absolute;
+ else
+ event->metric_sint64 = (int64_t) vl->values[index].counter;
}
- /*
- * Now produce valid protobuf structures
- */
- for (i = 0; i < vl->values_len; i++) {
- event = &event_tab[i];
- event__init(&event->ev);
-
- ev = &event->ev;
- event__init(ev);
- ev->host = host->name;
- ev->has_time = 1;
- ev->time = CDTIME_T_TO_TIME_T(vl->time);
- ev->has_ttl = 1;
- ev->ttl = CDTIME_T_TO_TIME_T(vl->interval) + host->delay;
- ev->n_tags = 3;
- ev->tags = (char **)event->tags;
- event->tags[0] = DS_TYPE_TO_STRING(ds->ds[i].type);
- event->tags[1] = vl->plugin;
- event->tags[2] = ds->ds[i].name;
- if (vl->plugin_instance && strlen(vl->plugin_instance)) {
- event->tags[ev->n_tags++] = vl->plugin_instance;
- }
- if (vl->type && strlen(vl->type)) {
- event->tags[ev->n_tags++] = vl->type;
- }
- if (vl->type_instance && strlen(vl->type_instance)) {
- event->tags[ev->n_tags++] = vl->type_instance;
+ /* TODO: Use FORMAT_VL() here. */
+ ssnprintf (service_buffer, sizeof(service_buffer),
+ "%s-%s-%s-%s-%s", vl->plugin, vl->plugin_instance,
+ vl->type, vl->type_instance, ds->ds[index].name);
+ event->service = strdup (service_buffer);
+
+ DEBUG ("riemann plugin: Successfully created protobuf for metric: "
+ "host = \"%s\", service = \"%s\"",
+ event->host, event->service);
+ return (event);
+} /* }}} Event *riemann_value_to_protobuf */
+
+static Msg *riemann_value_list_to_protobuf (struct riemann_host const *host, /* {{{ */
+ data_set_t const *ds,
+ value_list_t const *vl)
+{
+ Msg *msg;
+ size_t i;
+ gauge_t *rates = NULL;
+
+ /* Initialize the Msg structure. */
+ msg = malloc (sizeof (*msg));
+ if (msg == NULL)
+ {
+ ERROR ("riemann plugin: malloc failed.");
+ return (NULL);
+ }
+ memset (msg, 0, sizeof (*msg));
+ msg__init (msg);
+
+ /* Set up events. First, the list of pointers. */
+ msg->n_events = (size_t) vl->values_len;
+ msg->events = calloc (msg->n_events, sizeof (*msg->events));
+ if (msg->events == NULL)
+ {
+ ERROR ("riemann plugin: calloc failed.");
+ riemann_msg_protobuf_free (msg);
+ return (NULL);
+ }
+
+ if (host->store_rates)
+ {
+ rates = uc_get_rate (ds, vl);
+ if (rates == NULL)
+ {
+ ERROR ("riemann plugin: uc_get_rate failed.");
+ riemann_msg_protobuf_free (msg);
+ return (NULL);
}
+ }
- /* add user defined extra tags */
- for (j = 0; j < riemann_tagcount; j++)
- event->tags[ev->n_tags++] = riemann_tags[j];
-
- switch (ds->ds[i].type) {
- case DS_TYPE_COUNTER:
- ev->has_metric_sint64 = 1;
- ev->metric_sint64 = vl->values[i].counter;
- break;
- case DS_TYPE_GAUGE:
- ev->has_metric_d = 1;
- ev->metric_d = vl->values[i].gauge;
- break;
- case DS_TYPE_DERIVE:
- ev->has_metric_sint64 = 1;
- ev->metric_sint64 = vl->values[i].derive;
- break;
- case DS_TYPE_ABSOLUTE:
- ev->has_metric_sint64 = 1;
- ev->metric_sint64 = vl->values[i].absolute;
- break;
- default:
- WARNING("riemann_write: unknown metric type: %d",
- ds->ds[i].type);
- break;
+ for (i = 0; i < msg->n_events; i++)
+ {
+ msg->events[i] = riemann_value_to_protobuf (host, ds, vl,
+ (int) i, rates);
+ if (msg->events[i] == NULL)
+ {
+ riemann_msg_protobuf_free (msg);
+ sfree (rates);
+ return (NULL);
}
- ssnprintf(event->service, sizeof(event->service),
- "%s-%s-%s-%s-%s", vl->plugin, vl->plugin_instance,
- vl->type, vl->type_instance, ds->ds[i].name);
- ev->service = event->service;
- DEBUG("riemann_write: %s ready to send", ev->service);
- msg.events[i] = ev;
}
- status = riemann_send(host, &msg);
- sfree(msg.events);
+ sfree (rates);
+ return (msg);
+} /* }}} Msg *riemann_value_list_to_protobuf */
+
+static int
+riemann_notification(const notification_t *n, user_data_t *ud)
+{
+ int status;
+ struct riemann_host *host = ud->data;
+ Msg *msg;
+
+ msg = riemann_notification_to_protobuf (host, n);
+ if (msg == NULL)
+ return (-1);
+
+ status = riemann_send (host, msg);
+ if (status != 0)
+ ERROR ("riemann plugin: riemann_send failed with status %i",
+ status);
+
+ riemann_msg_protobuf_free (msg);
+ return (status);
+} /* }}} int riemann_notification */
+
+static int
+riemann_write(const data_set_t *ds,
+ const value_list_t *vl,
+ user_data_t *ud)
+{
+ int status;
+ struct riemann_host *host = ud->data;
+ Msg *msg;
+
+ msg = riemann_value_list_to_protobuf (host, ds, vl);
+ if (msg == NULL)
+ return (-1);
+
+ status = riemann_send (host, msg);
+ if (status != 0)
+ ERROR ("riemann plugin: riemann_send failed with status %i",
+ status);
+
+ riemann_msg_protobuf_free (msg);
return status;
}
-int
+/* host->lock must be held when calling this function. */
+static int
riemann_connect(struct riemann_host *host)
{
int e;
struct addrinfo *ai, *res, hints;
- char service[32];
+ char const *service;
if (host->flags & F_CONNECT)
return 0;
hints.ai_family = PF_UNSPEC;
hints.ai_socktype = SOCK_DGRAM;
- ssnprintf(service, sizeof(service), "%d", host->port);
+ assert (host->node != NULL);
+ service = (host->service != NULL) ? host->service : RIEMANN_PORT;
- if ((e = getaddrinfo(host->name, service, &hints, &res)) != 0) {
- WARNING("could not resolve host \"%s\": %s",
- host->name, gai_strerror(e));
+ if ((e = getaddrinfo(host->node, service, &hints, &res)) != 0) {
+ ERROR ("riemann plugin: Unable to resolve host \"%s\": %s",
+ host->node, gai_strerror(e));
return -1;
}
for (ai = res; ai != NULL; ai = ai->ai_next) {
- pthread_mutex_lock(&host->lock);
/*
* check if another thread did not already succesfully connect
*/
if ((host->s = socket(ai->ai_family,
ai->ai_socktype,
ai->ai_protocol)) == -1) {
- pthread_mutex_unlock(&host->lock);
WARNING("riemann_connect: could not open socket");
freeaddrinfo(res);
return -1;
if (connect(host->s, ai->ai_addr, ai->ai_addrlen) != 0) {
close(host->s);
host->flags |= ~F_CONNECT;
- pthread_mutex_unlock(&host->lock);
freeaddrinfo(res);
return -1;
}
host->flags |= F_CONNECT;
- DEBUG("got a succesful connection for: %s", host->name);
- pthread_mutex_unlock(&host->lock);
+ DEBUG("riemann plugin: got a succesful connection for: %s",
+ host->node);
break;
}
return 0;
}
-int
+/* host->lock must be held when calling this function. */
+static int
riemann_disconnect (struct riemann_host *host)
{
- if (host == NULL)
- return (EINVAL);
-
if ((host->flags & F_CONNECT) == 0)
return (0);
return (0);
}
-void
+static void
riemann_free(void *p)
{
struct riemann_host *host = p;
+ if (host == NULL)
+ return;
+
+ pthread_mutex_lock (&host->lock);
+
+ host->reference_count--;
+ if (host->reference_count > 0)
+ {
+ pthread_mutex_unlock (&host->lock);
+ return;
+ }
+
riemann_disconnect (host);
+
+ sfree(host->service);
+ pthread_mutex_destroy (&host->lock);
sfree(host);
}
-int
+static int
riemann_config_host(oconfig_item_t *ci)
{
struct riemann_host *host = NULL;
WARNING("riemann host allocation failed");
return ENOMEM;
}
+ pthread_mutex_init (&host->lock, NULL);
+ host->reference_count = 1;
+ host->node = NULL;
+ host->service = NULL;
+ host->delay = RIEMANN_DELAY;
- if (cf_util_get_string_buffer(ci, host->name,
- sizeof(host->name)) != 0) {
- WARNING("riemann host name too long");
- sfree(host);
+ status = cf_util_get_string (ci, &host->node);
+ if (status != 0) {
+ WARNING("riemann plugin: Required host name is missing.");
+ riemann_free (host);
return -1;
}
- host->port = RIEMANN_PORT;
- host->delay = RIEMANN_DELAY;
for (i = 0; i < ci->children_num; i++) {
/*
* The code here could be simplified but makes room
status = 0;
if (strcasecmp(child->key, "port") == 0) {
- if ((status = cf_util_get_port_number(child)) < 0) {
- WARNING("invalid port number");
+ status = cf_util_get_service (child, &host->service);
+ if (status != 0) {
+ ERROR ("riemann plugin: Invalid argument "
+ "configured for the \"Port\" "
+ "option.");
break;
}
- host->port = status;
- status = 0;
} else if (strcasecmp(child->key, "delay") == 0) {
if ((status = cf_util_get_int(ci, &host->delay)) != 0)
break;
+ } else if (strcasecmp ("StoreRates", child->key) == 0) {
+ status = cf_util_get_boolean (ci, &host->store_rates);
+ if (status != 0)
+ break;
} else {
WARNING("riemann plugin: ignoring unknown config "
"option: \"%s\"", child->key);
}
}
if (status != 0) {
- sfree(host);
+ riemann_free (host);
return status;
}
- pthread_mutex_init(&host->lock, NULL);
- ssnprintf(w_cb_name, sizeof(w_cb_name), "write-riemann/%s:%d",
- host->name, host->port);
- ssnprintf(n_cb_name, sizeof(n_cb_name), "notification-riemann/%s:%d",
- host->name, host->port);
+ ssnprintf(w_cb_name, sizeof(w_cb_name), "write-riemann/%s:%s",
+ host->node,
+ (host->service != NULL) ? host->service : RIEMANN_PORT);
+ ssnprintf(n_cb_name, sizeof(n_cb_name), "notification-riemann/%s:%s",
+ host->node,
+ (host->service != NULL) ? host->service : RIEMANN_PORT);
DEBUG("riemann w_cb_name: %s", w_cb_name);
DEBUG("riemann n_cb_name: %s", n_cb_name);
ud.data = host;
ud.free_func = riemann_free;
- if ((status = plugin_register_write(w_cb_name, riemann_write, &ud)) != 0)
- riemann_free(host);
+ pthread_mutex_lock (&host->lock);
- if ((status = plugin_register_notification(n_cb_name,
- riemann_notification,
- &ud)) != 0) {
- plugin_unregister_write(w_cb_name);
- riemann_free(host);
+ status = plugin_register_write (w_cb_name, riemann_write, &ud);
+ if (status != 0)
+ WARNING ("riemann plugin: plugin_register_write (\"%s\") "
+ "failed with status %i.",
+ w_cb_name, status);
+ else /* success */
+ host->reference_count++;
+
+ status = plugin_register_notification (n_cb_name,
+ riemann_notification, &ud);
+ if (status != 0)
+ WARNING ("riemann plugin: plugin_register_notification (\"%s\") "
+ "failed with status %i.",
+ n_cb_name, status);
+ else /* success */
+ host->reference_count++;
+
+ if (host->reference_count <= 1)
+ {
+ /* Both callbacks failed => free memory.
+ * We need to unlock here, because riemann_free() will lock.
+ * This is not a race condition, because we're the only one
+ * holding a reference. */
+ pthread_mutex_unlock (&host->lock);
+ riemann_free (host);
+ return (-1);
}
+
+ host->reference_count--;
+ pthread_mutex_unlock (&host->lock);
+
return status;
}
-int
+static int
riemann_config(oconfig_item_t *ci)
{
int i;
- char *newtag;
oconfig_item_t *child;
+ int status;
for (i = 0; i < ci->children_num; i++) {
child = &ci->children[i];
if (strcasecmp(child->key, "host") == 0) {
riemann_config_host(child);
} else if (strcasecmp(child->key, "tag") == 0) {
- if (riemann_tagcount >= RIEMANN_EXTRA_TAGS) {
- WARNING("riemann plugin: too many tags");
- return -1;
- }
- newtag = NULL;
- cf_util_get_string(child, &newtag);
- if (newtag == NULL)
- return -1;
- riemann_tags[riemann_tagcount++] = newtag;
- DEBUG("riemann_config: got tag: %s", newtag);
-
+ char *tmp = NULL;
+ status = cf_util_get_string(child, &tmp);
+ if (status != 0)
+ continue;
+
+ strarray_add (&riemann_tags, &riemann_tags_num, tmp);
+ DEBUG("riemann plugin: Got tag: %s", tmp);
+ sfree (tmp);
} else {
WARNING ("riemann plugin: Ignoring unknown "
"configuration option \"%s\" at top level.",
plugin_register_complex_config ("riemann", riemann_config);
}
+
+/* vim: set sw=8 sts=8 ts=8 noet : */
projects / collectd.git / blobdiff