From f0481f16ff200ef93c6ea4487a7bc3a59c8f52cb Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Sun, 6 Nov 2016 22:17:02 +0100 Subject: [PATCH] write_kafka plugin: Fix support for librdkafka 0.9.0. Use rd_kafka_set_logger() only when rd_kafka_conf_set_log_cb() is not available: write_kafka.c: In function 'kafka_handle': write_kafka.c:119:6: error: 'rd_kafka_set_logger' is deprecated (declared at /usr/local/include/librdkafka/rdkafka.h:2400) [-Werror=deprecated-declarations] rd_kafka_set_logger(ctx->kafka, kafka_log); ^ Fixes: #2029 --- configure.ac | 5 ++--- src/write_kafka.c | 10 +++++++++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index c07687d2..7748be86 100644 --- a/configure.ac +++ b/configure.ac @@ -3914,11 +3914,10 @@ then if test "x$with_librdkafka_log_cb" = "xyes" then AC_DEFINE(HAVE_LIBRDKAFKA_LOG_CB, 1, [Define if librdkafka log facility is present and usable.]) - fi - if test "x$with_librdkafka_logger" = "xyes" + else if test "x$with_librdkafka_logger" = "xyes" then AC_DEFINE(HAVE_LIBRDKAFKA_LOGGER, 1, [Define if librdkafka log facility is present and usable.]) - fi + fi; fi fi CPPFLAGS="$SAVE_CPPFLAGS" LDFLAGS="$SAVE_LDFLAGS" diff --git a/src/write_kafka.c b/src/write_kafka.c index 424acac9..eaaf1712 100644 --- a/src/write_kafka.c +++ b/src/write_kafka.c @@ -25,6 +25,7 @@ */ #include "collectd.h" + #include "plugin.h" #include "common.h" #include "configfile.h" @@ -65,7 +66,14 @@ 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 *); -#if defined HAVE_LIBRDKAFKA_LOGGER || defined HAVE_LIBRDKAFKA_LOG_CB +/* Version 0.9.0 of librdkafka deprecates rd_kafka_set_logger() in favor of + * rd_kafka_conf_set_log_cb(). This is to make sure we're not using the + * deprecated function. */ +#ifdef HAVE_LIBRDKAFKA_LOG_CB +# undef HAVE_LIBRDKAFKA_LOGGER +#endif + +#if defined(HAVE_LIBRDKAFKA_LOGGER) || defined(HAVE_LIBRDKAFKA_LOG_CB) static void kafka_log(const rd_kafka_t *, int, const char *, const char *); static void kafka_log(const rd_kafka_t *rkt, int level, -- 2.11.0