out_logdna: extract constants from key names

Signed-off-by: lecaros <lecaros@chronosphere.io>

Author: lecaros

plugins/out_logdna/logdna.c

@@ -26,6 +26,12 @@
 
 #include "logdna.h"
 
+#define LOGDNA_META_KEY "meta"
+#define LOGDNA_LEVEL_KEY "level"
+#define LOGDNA_SEVERITY_KEY "severity"
+#define LOGDNA_FILE_KEY "file"
+#define LOGDNA_APP_KEY "app"
+
 static inline int primary_key_check(msgpack_object k, char *name, int len)
 {
     if (k.type != MSGPACK_OBJECT_STR) {
@@ -74,11 +80,11 @@ static int record_append_primary_keys(struct flb_logdna *ctx,
     if (line_pck) {
         for (i = 0; i < map->via.map.size; i++) {
             k = map->via.map.ptr[i].key;
-            if (primary_key_check(k, "meta", 4) == FLB_TRUE ||
-                primary_key_check(k, "level", 5) == FLB_TRUE ||
-                primary_key_check(k, "severity", 8) == FLB_TRUE ||
-                primary_key_check(k, "file", 4) == FLB_TRUE ||
-                primary_key_check(k, "app", 3) == FLB_TRUE) {
+            if (primary_key_check(k, LOGDNA_META_KEY, sizeof(LOGDNA_META_KEY) - 1) == FLB_TRUE ||
+                primary_key_check(k, LOGDNA_LEVEL_KEY, sizeof(LOGDNA_LEVEL_KEY) - 1) == FLB_TRUE ||
+                primary_key_check(k, LOGDNA_SEVERITY_KEY, sizeof(LOGDNA_SEVERITY_KEY) - 1) == FLB_TRUE ||
+                primary_key_check(k, LOGDNA_FILE_KEY, sizeof(LOGDNA_FILE_KEY) - 1) == FLB_TRUE ||
+                primary_key_check(k, LOGDNA_APP_KEY, sizeof(LOGDNA_APP_KEY) - 1) == FLB_TRUE) {
                 continue;
             }
             line_count++;
@@ -93,41 +99,41 @@ static int record_append_primary_keys(struct flb_logdna *ctx,
 
         /* Level - optional */
         if (!level &&
-            (primary_key_check(k, "level", 5) == FLB_TRUE ||
-             primary_key_check(k, "severity", 8) == FLB_TRUE)) {
+            (primary_key_check(k, LOGDNA_LEVEL_KEY, sizeof(LOGDNA_LEVEL_KEY) - 1) == FLB_TRUE ||
+             primary_key_check(k, LOGDNA_SEVERITY_KEY, sizeof(LOGDNA_SEVERITY_KEY) - 1) == FLB_TRUE)) {
             level = &k;
-            msgpack_pack_str(mp_sbuf, 5);
-            msgpack_pack_str_body(mp_sbuf, "level", 5);
+            msgpack_pack_str(mp_sbuf, sizeof(LOGDNA_LEVEL_KEY) - 1);
+            msgpack_pack_str_body(mp_sbuf, LOGDNA_LEVEL_KEY, sizeof(LOGDNA_LEVEL_KEY) - 1);
             msgpack_pack_object(mp_sbuf, v);
             c++;
             is_primary = FLB_TRUE;
         }
 
         /* Meta - optional */
-        if (!meta && primary_key_check(k, "meta", 4) == FLB_TRUE) {
+        if (!meta && primary_key_check(k, LOGDNA_META_KEY, sizeof(LOGDNA_META_KEY) - 1) == FLB_TRUE) {
             meta = &k;
-            msgpack_pack_str(mp_sbuf, 4);
-            msgpack_pack_str_body(mp_sbuf, "meta", 4);
+            msgpack_pack_str(mp_sbuf, sizeof(LOGDNA_META_KEY) - 1);
+            msgpack_pack_str_body(mp_sbuf, LOGDNA_META_KEY, sizeof(LOGDNA_META_KEY) - 1);
             msgpack_pack_object(mp_sbuf, v);
             c++;
             is_primary = FLB_TRUE;
         }
 
         /* File */
-        if (!file && primary_key_check(k, "file", 4) == FLB_TRUE) {
+        if (!file && primary_key_check(k, LOGDNA_FILE_KEY, sizeof(LOGDNA_FILE_KEY) - 1) == FLB_TRUE) {
             file = &k;
-            msgpack_pack_str(mp_sbuf, 4);
-            msgpack_pack_str_body(mp_sbuf, "file", 4);
+            msgpack_pack_str(mp_sbuf, sizeof(LOGDNA_FILE_KEY) - 1);
+            msgpack_pack_str_body(mp_sbuf, LOGDNA_FILE_KEY, sizeof(LOGDNA_FILE_KEY) - 1);
             msgpack_pack_object(mp_sbuf, v);
             c++;
             is_primary = FLB_TRUE;
         }
 
         /* App */
-        if (!app && primary_key_check(k, "app", 3) == FLB_TRUE) {
+        if (!app && primary_key_check(k, LOGDNA_APP_KEY, sizeof(LOGDNA_APP_KEY) - 1) == FLB_TRUE) {
             app = &k;
-            msgpack_pack_str(mp_sbuf, 3);
-            msgpack_pack_str_body(mp_sbuf, "app", 3);
+            msgpack_pack_str(mp_sbuf, sizeof(LOGDNA_APP_KEY) - 1);
+            msgpack_pack_str_body(mp_sbuf, LOGDNA_APP_KEY, sizeof(LOGDNA_APP_KEY) - 1);
             msgpack_pack_object(mp_sbuf, v);
             c++;
             is_primary = FLB_TRUE;
@@ -141,17 +147,17 @@ static int record_append_primary_keys(struct flb_logdna *ctx,
 
     /* Set the global file name if the record did not provided one */
     if (!file && ctx->file) {
-        msgpack_pack_str(mp_sbuf, 4);
-        msgpack_pack_str_body(mp_sbuf, "file", 4);
+        msgpack_pack_str(mp_sbuf, sizeof(LOGDNA_FILE_KEY) - 1);
+        msgpack_pack_str_body(mp_sbuf, LOGDNA_FILE_KEY, sizeof(LOGDNA_FILE_KEY) - 1);
         msgpack_pack_str(mp_sbuf, flb_sds_len(ctx->file));
         msgpack_pack_str_body(mp_sbuf, ctx->file, flb_sds_len(ctx->file));
         c++;
     }
 
     /* If no application name is set, set the default */
     if (!app) {
-        msgpack_pack_str(mp_sbuf, 3);
-        msgpack_pack_str_body(mp_sbuf, "app", 3);
+        msgpack_pack_str(mp_sbuf, sizeof(LOGDNA_APP_KEY) - 1);
+        msgpack_pack_str_body(mp_sbuf, LOGDNA_APP_KEY, sizeof(LOGDNA_APP_KEY) - 1);
         msgpack_pack_str(mp_sbuf, flb_sds_len(ctx->app));
         msgpack_pack_str_body(mp_sbuf, ctx->app, flb_sds_len(ctx->app));
         c++;