in_syslog: tests: Use format instead of frame

The term of frame is a bit of low level concept for users.

Signed-off-by: Hiroshi Hatake <[email protected]>

Author: cosmo0920

plugins/in_syslog/syslog.c

@@ -245,9 +245,9 @@ static struct flb_config_map config_map[] = {
      "Key where the source address will be injected"
     },
     {
-     FLB_CONFIG_MAP_STR, "frame", (char *) NULL,
-     0, FLB_TRUE, offsetof(struct flb_syslog, frame_str),
-     "TCP framing: newline (default) or octet_counting (RFC 6587)"
+     FLB_CONFIG_MAP_STR, "format", (char *) NULL,
+     0, FLB_TRUE, offsetof(struct flb_syslog, format_str),
+     "Format of TCP framing: newline (default) or octet_counting (RFC 6587)"
     },
 
     /* EOF */

plugins/in_syslog/syslog.h

@@ -72,7 +72,7 @@ struct flb_syslog {
     flb_sds_t source_address_key;
 
     /* TCP framing */
-    flb_sds_t frame_str;
+    flb_sds_t format_str;
     int frame_type;
 
     int dgram_mode_flag;

plugins/in_syslog/syslog_conf.c

@@ -109,14 +109,14 @@ struct flb_syslog *syslog_conf_create(struct flb_input_instance *ins,
 
     /* TCP Frame type (only applies to stream modes; default newline) */
     ctx->frame_type = FLB_SYSLOG_FRAME_NEWLINE;
-    if (ctx->frame_str != NULL) {
-        if (strcasecmp(ctx->frame_str, "octet_counting") == 0 ||
-            strcasecmp(ctx->frame_str, "octet") == 0) {
+    if (ctx->format_str != NULL) {
+        if (strcasecmp(ctx->format_str, "octet_counting") == 0 ||
+            strcasecmp(ctx->format_str, "octet") == 0) {
             ctx->frame_type = FLB_SYSLOG_FRAME_OCTET_COUNTING;
         }
-        else if (strcasecmp(ctx->frame_str, "newline") != 0) {
+        else if (strcasecmp(ctx->format_str, "newline") != 0) {
             flb_plg_warn(ins, "[in_syslog] unknown frame '%s', using 'newline'",
-                         ctx->frame_str);
+                         ctx->format_str);
         }
     }
 

tests/runtime/in_syslog.c

@@ -1091,7 +1091,7 @@ void flb_test_syslog_tcp_octet_counting()
 
     ret = flb_input_set(ctx->flb, ctx->i_ffd,
                         "mode", "tcp",
-                        "frame", "octet_counting",
+                        "format", "octet_counting",
                         "parser", PARSER_NAME_RFC5424,
                         NULL);
     TEST_CHECK(ret == 0);
@@ -1154,7 +1154,7 @@ void flb_test_syslog_tcp_octet_counting_lf()
 
     ret = flb_input_set(ctx->flb, ctx->i_ffd,
                         "mode", "tcp",
-                        "frame", "octet_counting",
+                        "format", "octet_counting",
                         "parser", PARSER_NAME_RFC5424,
                         NULL);
     TEST_CHECK(ret == 0);
@@ -1221,7 +1221,7 @@ void flb_test_syslog_tcp_octet_counting_fragmented()
 
     ret = flb_input_set(ctx->flb, ctx->i_ffd,
                         "mode", "tcp",
-                        "frame", "octet_counting",
+                        "format", "octet_counting",
                         "parser", PARSER_NAME_RFC5424,
                         NULL);
     TEST_CHECK(ret == 0);
@@ -1299,7 +1299,7 @@ void flb_test_syslog_tcp_octet_counting_multi()
 
     ret = flb_input_set(ctx->flb, ctx->i_ffd,
                         "mode", "tcp",
-                        "frame", "octet_counting",
+                        "format", "octet_counting",
                         "parser", PARSER_NAME_RFC5424,
                         NULL);
     TEST_CHECK(ret == 0);