in_forward: support config map

Signed-off-by: Takahiro Yamashita <[email protected]>

Author: nokute78

plugins/in_forward/fw.c

@@ -206,6 +206,26 @@ static int in_fw_exit(void *data, struct flb_config *config)
     return 0;
 }
 
+/* Configuration properties map */
+static struct flb_config_map config_map[] = {
+   {
+    FLB_CONFIG_MAP_STR, "unix_path", NULL,
+    0, FLB_TRUE, offsetof(struct flb_in_fw_config, unix_path),
+    "The path to unix socket to receive a Forward message."
+   },
+   {
+    FLB_CONFIG_MAP_SIZE, "buffer_chunk_size", FLB_IN_FW_CHUNK_SIZE,
+    0, FLB_TRUE, offsetof(struct flb_in_fw_config, buffer_chunk_size),
+    "The buffer memory size used to receive a Forward message."
+   },
+   {
+    FLB_CONFIG_MAP_SIZE, "buffer_max_size", FLB_IN_FW_CHUNK_MAX_SIZE,
+    0, FLB_TRUE, offsetof(struct flb_in_fw_config, buffer_max_size),
+    "The maximum buffer memory size used to receive a Forward message."
+   },
+   {0}
+};
+
 /* Plugin reference */
 struct flb_input_plugin in_forward_plugin = {
     .name         = "forward",
@@ -216,5 +236,6 @@ struct flb_input_plugin in_forward_plugin = {
     .cb_flush_buf = NULL,
     .cb_pause     = in_fw_pause,
     .cb_exit      = in_fw_exit,
+    .config_map   = config_map,
     .flags        = FLB_INPUT_NET
 };

plugins/in_forward/fw_config.c

@@ -20,6 +20,7 @@
 
 #include <stdlib.h>
 #include <fluent-bit/flb_utils.h>
+#include <fluent-bit/flb_input_plugin.h>
 
 #include "fw.h"
 #include "fw_conn.h"
@@ -28,8 +29,7 @@
 struct flb_in_fw_config *fw_config_init(struct flb_input_instance *i_ins)
 {
     char tmp[16];
-    const char *buffer_size;
-    const char *chunk_size;
+    int ret = -1;
     const char *p;
     struct flb_in_fw_config *config;
 
@@ -39,38 +39,22 @@ struct flb_in_fw_config *fw_config_init(struct flb_input_instance *i_ins)
         return NULL;
     }
 
-    p = flb_input_get_property("unix_path", i_ins);
-    if (p) {
-        config->unix_path = flb_strdup(p);
+    ret = flb_input_config_map_set(i_ins, (void *)config);
+    if (ret == -1) {
+        flb_plg_error(i_ins, "config map set error");
+        flb_free(config);
+        return NULL;
     }
-    else {
+
+    p = flb_input_get_property("unix_path", i_ins);
+    if (p == NULL) {
         /* Listen interface (if not set, defaults to 0.0.0.0:24224) */
         flb_input_net_default_listener("0.0.0.0", 24224, i_ins);
         config->listen = i_ins->host.listen;
         snprintf(tmp, sizeof(tmp) - 1, "%d", i_ins->host.port);
         config->tcp_port = flb_strdup(tmp);
     }
 
-    /* Chunk size */
-    chunk_size = flb_input_get_property("buffer_chunk_size", i_ins);
-    if (!chunk_size) {
-        config->buffer_chunk_size = FLB_IN_FW_CHUNK_SIZE; /* 1MB */
-    }
-    else {
-        /* Convert KB unit to Bytes */
-        config->buffer_chunk_size  = flb_utils_size_to_bytes(chunk_size);
-    }
-
-    /* Buffer size */
-    buffer_size = flb_input_get_property("buffer_max_size", i_ins);
-    if (!buffer_size) {
-        config->buffer_max_size = FLB_IN_FW_CHUNK_MAX_SIZE; /* 6MB */
-    }
-    else {
-        /* Convert unit to bytes */
-        config->buffer_max_size  = flb_utils_size_to_bytes(buffer_size);
-    }
-
     if (!config->unix_path) {
         flb_debug("[in_fw] Listen='%s' TCP_Port=%s",
                   config->listen, config->tcp_port);
@@ -82,7 +66,6 @@ int fw_config_destroy(struct flb_in_fw_config *config)
 {
     if (config->unix_path) {
         unlink(config->unix_path);
-        flb_free(config->unix_path);
     }
     else {
         flb_free(config->tcp_port);

plugins/in_forward/fw_conn.h

@@ -21,8 +21,8 @@
 #ifndef FLB_IN_FW_CONN_H
 #define FLB_IN_FW_CONN_H
 
-#define FLB_IN_FW_CHUNK_SIZE      1024000 /* 1MB */
-#define FLB_IN_FW_CHUNK_MAX_SIZE  FLB_IN_FW_CHUNK_SIZE * 6 /* 6M */
+#define FLB_IN_FW_CHUNK_SIZE      "1024000" /* 1MB */
+#define FLB_IN_FW_CHUNK_MAX_SIZE  "6144000" /* =FLB_IN_FW_CHUNK_SIZE * 6.  6MB */
 
 enum {
     FW_NEW        = 1,  /* it's a new connection                */