X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fwrite_kafka.c;h=3e683c8432c1911f381a9f3e67deeba48c1aff99;hb=bc014af07ee3ea6231c629cc72099f668788a343;hp=5dc436474539ded1284e92af7b2bb5f043ce62a4;hpb=8f4a48a804f9d95010cf5ad469e4729cebc3e0e9;p=collectd.git

diff --git a/src/write_kafka.c b/src/write_kafka.c
index 5dc43647..3e683c84 100644
--- a/src/write_kafka.c
+++ b/src/write_kafka.c
@@ -40,9 +40,9 @@
 #include <zlib.h>
 
 struct kafka_topic_context {
+#define KAFKA_FORMAT_JSON        0
 #define KAFKA_FORMAT_COMMAND     1
 #define KAFKA_FORMAT_GRAPHITE    2
-#define KAFKA_FORMAT_JSON        3
     u_int8_t                     format;
     unsigned int                 graphite_flags;
     _Bool                        store_rates;
@@ -60,6 +60,8 @@ struct kafka_topic_context {
 static int kafka_write(const data_set_t *, const value_list_t *, user_data_t *);
 static int32_t kafka_partition(const rd_kafka_topic_t *, const void *, size_t,
                                int32_t, void *, void *);
+
+#ifdef HAVE_LIBRDKAFKA_LOGGER
 static void kafka_log(const rd_kafka_t *, int, const char *, const char *);
 
 static void kafka_log(const rd_kafka_t *rkt, int level,
@@ -67,6 +69,7 @@ static void kafka_log(const rd_kafka_t *rkt, int level,
 {
     plugin_log(level, "%s", msg);
 }
+#endif
 
 static int32_t kafka_partition(const rd_kafka_topic_t *rkt,
                                const void *keydata, size_t keylen,
@@ -165,7 +168,7 @@ static void kafka_config_topic(rd_kafka_conf_t *conf, oconfig_item_t *ci) /* {{{
     int                          status;
     int                          i;
     struct kafka_topic_context  *tctx;
-    char                        *key;
+    char                        *key = NULL;
     char                        *val;
     char                         callback_name[DATA_MAX_NAME_LEN];
     char                         errbuf[1024];
@@ -180,14 +183,20 @@ static void kafka_config_topic(rd_kafka_conf_t *conf, oconfig_item_t *ci) /* {{{
 
     tctx->escape_char = '.';
     tctx->store_rates = 1;
+    tctx->format = KAFKA_FORMAT_JSON;
 
+#ifdef HAVE_LIBRDKAFKA_LOG_CB
     rd_kafka_conf_set_log_cb(conf, kafka_log);
+#endif
     if ((tctx->kafka = rd_kafka_new(RD_KAFKA_PRODUCER, conf,
                                     errbuf, sizeof(errbuf))) == NULL) {
         sfree(tctx);
         ERROR("write_kafka plugin: cannot create kafka handle.");
         return;
     }
+#ifdef HAVE_LIBRDKAFKA_LOGGER
+    rd_kafka_conf_set_logger(tctx->kafka, kafka_log);
+#endif
     conf = NULL;
 
     if ((tctx->conf = rd_kafka_topic_conf_new()) == NULL) {
@@ -262,7 +271,6 @@ static void kafka_config_topic(rd_kafka_conf_t *conf, oconfig_item_t *ci) /* {{{
             assert(key != NULL);
 
             if (strcasecmp(key, "Command") == 0) {
-
                 tctx->format = KAFKA_FORMAT_COMMAND;
 
             } else if (strcasecmp(key, "Graphite") == 0) {
@@ -275,6 +283,7 @@ static void kafka_config_topic(rd_kafka_conf_t *conf, oconfig_item_t *ci) /* {{{
                 WARNING ("write_kafka plugin: Invalid format string: %s",
                          key);
             }
+
             sfree(key);
 
         } else if (strcasecmp ("StoreRates", child->key) == 0) {