X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fwrite_riemann.c;h=58611a96fe2ec40adff997503eea1ae8dcf2284b;hb=2cf10557f58144e13793a3d69ae5d4b7c8d6c305;hp=a09c72361f910ac8615a219fd9187da36e77a819;hpb=eab8493d114c7c209d90ac54edb7c8026c085747;p=collectd.git diff --git a/src/write_riemann.c b/src/write_riemann.c index a09c7236..58611a96 100644 --- a/src/write_riemann.c +++ b/src/write_riemann.c @@ -26,13 +26,6 @@ * Florian octo Forster */ -#include "collectd.h" -#include "plugin.h" -#include "common.h" -#include "configfile.h" -#include "utils_cache.h" -#include "riemann.pb-c.h" - #include #include #include @@ -40,13 +33,19 @@ #include #include +#include "collectd.h" +#include "plugin.h" +#include "common.h" +#include "configfile.h" +#include "utils_cache.h" +#include "riemann.pb-c.h" +#include "write_riemann_threshold.h" + #define RIEMANN_HOST "localhost" #define RIEMANN_PORT "5555" #define RIEMANN_TTL_FACTOR 2.0 #define RIEMANN_BATCH_MAX 8192 -int write_riemann_threshold_check(const data_set_t *, const value_list_t *, int *); - struct riemann_host { char *name; char *event_service_prefix; @@ -1051,6 +1050,7 @@ static int riemann_config(oconfig_item_t *ci) /* {{{ */ } if ((val = strdup(child->values[1].value.string)) == NULL) { WARNING("cannot allocate memory for attribute value."); + sfree (key); return (-1); } strarray_add(&riemann_attrs, &riemann_attrs_num, key);