out_tcp: document config_map, fix return value and set context to upstream

Signed-off-by: Eduardo Silva <[email protected]>

Author: edsiper

plugins/out_tcp/tcp.c

@@ -110,25 +110,30 @@ static int cb_tcp_exit(void *data, struct flb_config *config)
     return 0;
 }
 
-/* Configuration properties map */	
-static struct flb_config_map config_map[] = {	
-    {	
-     FLB_CONFIG_MAP_STR, "format", NULL,	
-     0, FLB_FALSE, 0,	
-     NULL	
-    },	
-    {	
-     FLB_CONFIG_MAP_STR, "json_date_format", NULL,	
-     0, FLB_FALSE, 0,	
-     NULL	
-    },	
-    {	
-     FLB_CONFIG_MAP_STR, "json_date_key", "date",	
-     0, FLB_TRUE, offsetof(struct flb_out_tcp, json_date_key),	
-     NULL	
-    },	
-    /* EOF */	
-    {0}	
+/* Configuration properties map */
+static struct flb_config_map config_map[] = {
+    {
+     FLB_CONFIG_MAP_STR, "format", "msgpack",
+     0, FLB_FALSE, 0,
+     "Specify the payload format, supported formats: msgpack, json, "
+     "json_lines or json_stream."
+    },
+
+    {
+     FLB_CONFIG_MAP_STR, "json_date_format", "double",
+     0, FLB_FALSE, 0,
+     "Specify the format of the date, supported formats: double, iso8601 "
+     "(e.g: 2018-05-30T09:39:52.000681Z) and epoch."
+    },
+
+    {
+     FLB_CONFIG_MAP_STR, "json_date_key", "date",
+     0, FLB_TRUE, offsetof(struct flb_out_tcp, json_date_key),
+     "Specify the name of the date field in output."
+    },
+
+    /* EOF */
+    {0}
 };
 
 /* Plugin reference */

plugins/out_tcp/tcp_conf.c

@@ -42,11 +42,11 @@ struct flb_out_tcp *flb_tcp_conf_create(struct flb_output_instance *ins,
         return NULL;
     }
     ctx->ins = ins;
-    
-    ret = flb_output_config_map_set(ins, (void *) ctx);	
-    if (ret == -1) {	
-        return -1;	
-    }	
+
+    ret = flb_output_config_map_set(ins, (void *) ctx);
+    if (ret == -1) {
+        return NULL;
+    }
 
     /* Set default network configuration if not set */
     flb_output_net_default("127.0.0.1", 5170, ins);
@@ -107,6 +107,8 @@ struct flb_out_tcp *flb_tcp_conf_create(struct flb_output_instance *ins,
     }
 
     ctx->u = upstream;
+    flb_output_upstream_set(ctx->u, ins);
+
     ctx->host = ins->host.name;
     ctx->port = ins->host.port;