source/collectd
1
0
Fork 0
mirror of https://github.com/collectd/collectd.git synced 2026-02-09 04:09:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

write_kafka plugin: Fix support for librdkafka 0.9.0.

Browse Source 
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
This commit is contained in:
Florian Forster
2016-11-06 22:17:02 +01:00
parent f7e26c24f0
commit f0481f16ff
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
configure.ac
View File

@@ -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"

10
src/write_kafka.c
View File

@@ -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,