Merge pull request #3 from Craig-Robb-GGL/craigr/flb-network-verifier-updates

updates to network verifier after upstream PR comments

Author: Craig-Robb-GGL

include/fluent-bit/flb_output.h

@@ -48,6 +48,7 @@
 #include <fluent-bit/flb_upstream_ha.h>
 #include <fluent-bit/flb_event.h>
 #include <fluent-bit/flb_processor.h>
+#include <fluent-bit/flb_network_verifier.h>
 
 #include <cfl/cfl.h>
 #include <cmetrics/cmetrics.h>

src/flb_engine.c

@@ -1323,9 +1323,11 @@ int flb_engine_shutdown(struct flb_config *config)
     flb_filter_exit(config);
     flb_output_exit(config);
     flb_custom_exit(config);
-    flb_network_verifier_exit(config);
     flb_input_exit_all(config);
 
+    /* cleanup network verifier after other plugins potentially using it */
+    flb_network_verifier_exit(config);
+
     /* scheduler */
     sched_params = (struct flb_sched_timer_coro_cb_params *) FLB_TLS_GET(sched_timer_coro_cb_params);
     if (sched_params && sched_params->magic == FLB_SCHED_TLS_MAGIC) {

src/flb_network.c

@@ -1520,7 +1520,7 @@ flb_sockfd_t flb_net_tcp_connect(const char *host, unsigned long port,
             flb_debug("[net] socket #%i could not connect to %s:%s",
                       fd, address, _port);
 
-            flb_connection_notify_error(u_conn, address, port, ret,
+            flb_connection_notify_error(u_conn, address, port, -1,
                                         "Couldn't connect to end point");
 
             if (u_conn) {

src/flb_network_verifier.c

@@ -299,7 +299,7 @@ const struct flb_network_verifier_instance *find_network_verifier_instance(
 
     mk_list_foreach(head, &config->network_verifiers) {
         verifier = mk_list_entry(head, struct flb_network_verifier_instance, _head);
-        if (strcmp(verifier->alias, alias) == 0) {
+        if (verifier->alias != NULL && strcmp(verifier->alias, alias) == 0) {
             return verifier;
         }
     }

src/flb_reload.c

@@ -268,7 +268,7 @@ int flb_reload_property_check_all(struct flb_config *config)
         return -1;
     }
 
-    /* Check properties of tls verifier plugins */
+    /* Check properties of network verifier plugins */
     ret = flb_network_verifier_property_check_all(config);
     if (ret == -1) {
         flb_error("[reload] check properties for network verifier plugins has failed");