Merge remote-tracking branch 'github-octo/pyr/riemann' into pyr/riemann

diff --git a/src/common.c b/src/common.c
index b679bf7..82a4f01 100644 (file)
--- a/src/common.c
+++ b/src/common.c
@@ -1396,3 +1396,35 @@ int strtoderive (const char *string, derive_t *ret_value) /* {{{ */
        *ret_value = tmp;
        return (0);
 } /* }}} int strtoderive */
+
+int strarray_add (char ***ret_array, size_t *ret_array_len, char const *str) /* {{{ */
+{
+       char **array;
+       size_t array_len = *ret_array_len;
+
+       if (str == NULL)
+               return (EINVAL);
+
+       array = realloc (*ret_array,
+            (array_len + 1) * sizeof (*array));
+       if (array == NULL)
+               return (ENOMEM);
+       *ret_array = array;
+
+       array[array_len] = strdup (str);
+       if (array[array_len] == NULL)
+               return (ENOMEM);
+
+       array_len++;
+        *ret_array_len = array_len;
+       return (0);
+} /* }}} int strarray_add */
+
+void strarray_free (char **array, size_t array_len) /* {{{ */
+{
+       size_t i;
+
+       for (i = 0; i < array_len; i++)
+               sfree (array[i]);
+       sfree (array);
+} /* }}} void strarray_free */

diff --git a/src/common.h b/src/common.h
index 8a7d986..2c74436 100644 (file)
--- a/src/common.h
+++ b/src/common.h
@@ -317,4 +317,7 @@ int service_name_to_port_number (const char *service_name);
  * failure. If failure is returned, ret_value is not touched. */
 int strtoderive (const char *string, derive_t *ret_value);
 
+int strarray_add (char ***ret_array, size_t *ret_array_len, char const *str);
+void strarray_free (char **array, size_t array_len);
+
 #endif /* COMMON_H */

diff --git a/src/riemann.c b/src/riemann.c
index ebffd6c..4af77b4 100644 (file)
--- a/src/riemann.c
+++ b/src/riemann.c
@@ -49,8 +49,8 @@ struct riemann_host {
        int                      reference_count;
 };
 
-static char    *riemann_tags[RIEMANN_EXTRA_TAGS];
-static int      riemann_tagcount;
+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 *);
@@ -64,8 +64,6 @@ void  module_register(void);
 
 static void riemann_event_protobuf_free (Event *event) /* {{{ */
 {
-       size_t i;
-
        if (event == NULL)
                return;
 
@@ -74,9 +72,9 @@ static void riemann_event_protobuf_free (Event *event) /* {{{ */
        sfree (event->host);
        sfree (event->description);
 
-       for (i = 0; i < event->n_tags; i++)
-               sfree (event->tags[i]);
-       sfree (event->tags);
+       strarray_free (event->tags, event->n_tags);
+       event->tags = NULL;
+       event->n_tags = 0;
 
        sfree (event);
 } /* }}} void riemann_event_protobuf_free */
@@ -155,13 +153,6 @@ static int riemann_event_add_tag (Event *event, /* {{{ */
        char buffer[1024];
        size_t ret;
 
-       char **tmp;
-
-       tmp = realloc (event->tags, (event->n_tags + 1) * sizeof (*event->tags));
-       if (tmp == NULL)
-               return (ENOMEM);
-       event->tags = tmp;
-
        va_start (ap, format);
        ret = vsnprintf (buffer, sizeof (buffer), format, ap);
        if (ret >= sizeof (buffer))
@@ -169,11 +160,7 @@ static int riemann_event_add_tag (Event *event, /* {{{ */
        buffer[ret] = 0;
        va_end (ap);
 
-       event->tags[event->n_tags] = strdup (buffer);
-       if (event->tags[event->n_tags] == NULL)
-               return (ENOMEM);
-       event->n_tags++;
-       return (0);
+       return (strarray_add (&event->tags, &event->n_tags, buffer));
 } /* }}} int riemann_event_add_tag */
 
 static Msg *riemann_notification_to_protobuf (struct riemann_host *host, /* {{{ */
@@ -243,7 +230,7 @@ static Msg *riemann_notification_to_protobuf (struct riemann_host *host, /* {{{
                riemann_event_add_tag (event, "type_instance:%s",
                                n->type_instance);
 
-       for (i = 0; i < riemann_tagcount; i++)
+       for (i = 0; i < riemann_tags_num; i++)
                riemann_event_add_tag (event, "%s", riemann_tags[i]);
 
        /* TODO: Use FORMAT_VL() here. */
@@ -316,7 +303,7 @@ static Event *riemann_value_to_protobuf (struct riemann_host const *host, /* {{{
        riemann_event_add_tag (event, "ds_name:%s", ds->ds[index].name);
        riemann_event_add_tag (event, "ds_index:%zu", index);
 
-       for (i = 0; i < riemann_tagcount; i++)
+       for (i = 0; i < riemann_tags_num; i++)
                riemann_event_add_tag (event, "%s", riemann_tags[i]);
 
        if (ds->ds[index].type == DS_TYPE_GAUGE)
@@ -668,8 +655,8 @@ 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];
@@ -677,17 +664,14 @@ riemann_config(oconfig_item_t *ci)
                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.",