build: enable in_kafka and out_kafka by default

close fluent#5189 Signed-off-by: Thiago Padilha <[email protected]>
tarruda · Apr 6, 2022 · 049ef77 · 049ef77
1 parent 80da57c
commit 049ef77
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -123,7 +123,7 @@ option(FLB_IN_FORWARD         "Enable Forward input plugin"         Yes)
 option(FLB_IN_HEALTH          "Enable Health input plugin"          Yes)
 option(FLB_IN_HTTP            "Enable HTTP input plugin"            Yes)
 option(FLB_IN_MEM             "Enable Memory input plugin"          Yes)
-option(FLB_IN_KAFKA           "Enable Kafka input plugin"           No)
+option(FLB_IN_KAFKA           "Enable Kafka input plugin"           Yes)
 option(FLB_IN_KMSG            "Enable Kernel log input plugin"      Yes)
 option(FLB_IN_LIB             "Enable library mode input plugin"    Yes)
 option(FLB_IN_RANDOM          "Enable random input plugin"          Yes)
@@ -183,7 +183,7 @@ option(FLB_OUT_NULL           "Enable dev null output plugin"       Yes)
 option(FLB_OUT_FLOWCOUNTER    "Enable flowcount output plugin"      Yes)
 option(FLB_OUT_LOGDNA         "Enable LogDNA output plugin"         Yes)
 option(FLB_OUT_LOKI           "Enable Loki output plugin"           Yes)
-option(FLB_OUT_KAFKA          "Enable Kafka output plugin"           No)
+option(FLB_OUT_KAFKA          "Enable Kafka output plugin"          Yes)
 option(FLB_OUT_KAFKA_REST     "Enable Kafka Rest output plugin"     Yes)
 option(FLB_OUT_CLOUDWATCH_LOGS "Enable AWS CloudWatch output plugin" Yes)
 option(FLB_OUT_KINESIS_FIREHOSE "Enable AWS Firehose output plugin" Yes)

diff --git a/plugins/in_kafka/in_kafka.c b/plugins/in_kafka/in_kafka.c
@@ -109,7 +109,7 @@ static void process_message(mpack_writer_t *writer,
 static void in_kafka_callback(int write_fd, void *data)
 {
     struct flb_input_thread *it = data;
-    struct flb_in_kafka_config *ctx = data - offsetof(struct flb_in_kafka_config, it);
+    struct flb_in_kafka_config *ctx = container_of(data, struct flb_in_kafka_config, it);
     mpack_writer_t *writer = &ctx->it.writer;
 
     while (!flb_input_thread_exited(it)) {
@@ -226,7 +226,7 @@ static int in_kafka_exit(void *in_context, struct flb_config *config)
     }
 
     it = in_context;
-    ctx = (in_context - offsetof(struct flb_in_kafka_config, it));
+    ctx = container_of(in_context, struct flb_in_kafka_config, it));
     flb_input_thread_destroy(it, ctx->ins);
     rd_kafka_destroy(ctx->kafka.rk);
     flb_free(ctx->kafka.brokers);