author | Florian Forster <octo@collectd.org> | |
Thu, 17 Dec 2015 09:09:28 +0000 (10:09 +0100) | ||
committer | Florian Forster <octo@collectd.org> | |
Thu, 17 Dec 2015 09:09:28 +0000 (10:09 +0100) |
src/email.c | patch | blob | history | |
src/redis.c | patch | blob | history | |
src/write_kafka.c | patch | blob | history | |
src/write_riemann_threshold.c | patch | blob | history |
diff --git a/src/email.c b/src/email.c
index 0b140bfed55a0560aeb6e4f06f42ec39987c190e..4f5753c3f49fbecce57390a2096b30ca8f554f4f 100644 (file)
--- a/src/email.c
+++ b/src/email.c
}
connection = malloc (sizeof (*connection));
- if (connection != NULL)
+ if (connection == NULL)
{
close (remote);
continue;
diff --git a/src/redis.c b/src/redis.c
index a40d2cd2b48b9f0880f61f61a2177b6a476e1a22..9282e1938a3263601ad674e7f3dcad45f75be544 100644 (file)
--- a/src/redis.c
+++ b/src/redis.c
@@ -304,7 +304,7 @@ int redis_handle_info (char *node, char const *info_line, char const *type, char
int i;
str += strlen (field_name) + 1; /* also skip the ':' */
- for(i=0;(*str && (isdigit(*str) || *str == '.'));i++,str++)
+ for(i=0;(*str && (isdigit((unsigned char)*str) || *str == '.'));i++,str++)
buf[i] = *str;
buf[i] ='\0';
diff --git a/src/write_kafka.c b/src/write_kafka.c
index 736fddb12a993f8aeaebea16a8a7e513351bda6a..a5371d4c0a933e40d3c2c9051babf5b39383909f 100644 (file)
--- a/src/write_kafka.c
+++ b/src/write_kafka.c
rd_kafka_topic_t *topic;
rd_kafka_conf_t *kafka_conf;
rd_kafka_t *kafka;
- int has_key;
- uint32_t key;
+ char *key;
char *prefix;
char *postfix;
char escape_char;
user_data_t *ud)
{
int status = 0;
- uint32_t key;
+ void *key;
+ size_t keylen = 0;
char buffer[8192];
size_t bfree = sizeof(buffer);
size_t bfill = 0;
return -1;
}
- /*
- * We partition our stream by metric name
- */
- if (ctx->has_key)
- key = ctx->key;
- else
- key = rand();
+ key = ctx->key;
+ if (key != NULL)
+ keylen = strlen (key);
rd_kafka_produce(ctx->topic, RD_KAFKA_PARTITION_UA,
RD_KAFKA_MSG_F_COPY, buffer, blen,
- &key, sizeof(key), NULL);
+ key, keylen, NULL);
return status;
} /* }}} int kafka_write */
@@ -318,19 +314,7 @@ static void kafka_config_topic(rd_kafka_conf_t *conf, oconfig_item_t *ci) /* {{{
}
} else if (strcasecmp ("Key", child->key) == 0) {
- char *tmp_buf = NULL;
- status = cf_util_get_string(child, &tmp_buf);
- if (status != 0) {
- WARNING("write_kafka plugin: invalid key supplied");
- break;
- }
-
- if (strcasecmp(tmp_buf, "Random") != 0) {
- tctx->has_key = 1;
- tctx->key = crc32_buffer((u_char *)tmp_buf, strlen(tmp_buf));
- }
- sfree(tmp_buf);
-
+ cf_util_get_string (child, &tctx->key);
} else if (strcasecmp ("Format", child->key) == 0) {
status = cf_util_get_string(child, &key);
if (status != 0)
index 5c8559eb7b157414cd86df73a07ae25ab4e6927b..f001ee5469a98fe7224c61d07b3a889f3ba5d148 100644 (file)
#include "utils_threshold.h"
#include <assert.h>
-#include <ltdl.h>
#include <pthread.h>
/*