Reflect the review results.

Author: yuichiro-naito

src/flb_lib.c

@@ -143,24 +143,25 @@ void flb_init_env()
 int flb_create_event_loop(flb_ctx_t *ctx)
 {
     int ret;
-    struct flb_config *config = ctx->config;
+    struct flb_config *config;
+
+    if (ctx == NULL)
+        return FLB_LIB_ERROR;
+
+    config = ctx->config;
 
     /* Create the event loop to receive notifications */
     ctx->event_loop = mk_event_loop_create(256);
-    if (!ctx->event_loop) {
-        flb_config_exit(ctx->config);
-        flb_free(ctx);
+    if (!ctx->event_loop)
         return FLB_LIB_ERROR;
-    }
+
     config->ch_evl = ctx->event_loop;
 
     /* Prepare the notification channels */
     ctx->event_channel = flb_calloc(1, sizeof(struct mk_event));
     if (!ctx->event_channel) {
         perror("calloc");
-        flb_config_exit(ctx->config);
-        flb_free(ctx);
-        return FLB_LIB_ERROR;
+        goto error_1;
     }
 
     MK_EVENT_ZERO(ctx->event_channel);
@@ -171,36 +172,48 @@ int flb_create_event_loop(flb_ctx_t *ctx)
                                   ctx->event_channel);
     if (ret != 0) {
         flb_error("[lib] could not create notification channels");
-        flb_stop(ctx);
-        flb_destroy(ctx);
-        return FLB_LIB_ERROR;
+        goto error_2;
     }
 
     return 0;
+
+error_2:
+    flb_free(ctx->event_channel);
+    ctx->event_channel = NULL;
+error_1:
+    mk_event_loop_destroy(ctx->event_loop);
+    ctx->event_loop = NULL;
+    return FLB_LIB_ERROR;
 }
 
 int flb_destroy_event_loop(flb_ctx_t *ctx)
 {
     int ret;
     struct flb_config *config;
 
-    if (ctx == NULL)
+    if (ctx == NULL || ctx->config == NULL)
         return 0;
 
     config = ctx->config;
-    ret = mk_event_channel_destroy(config->ch_evl,
-                                   config->ch_notif[0],
-                                   config->ch_notif[1],
-                                   ctx->event_channel);
-    if (ret != 0) {
-        /* make sure to close file descriptors */
-        close(config->ch_notif[0]);
-        close(config->ch_notif[1]);
+    if (ctx->event_channel != NULL) {
+        ret = mk_event_channel_destroy(config->ch_evl,
+                                       config->ch_notif[0],
+                                       config->ch_notif[1],
+                                       ctx->event_channel);
+        if (ret != 0) {
+            /* make sure to close file descriptors */
+            close(config->ch_notif[0]);
+            close(config->ch_notif[1]);
+        }
+        free(ctx->event_channel);
+        ctx->event_channel = NULL;
     }
 
-    free(ctx->event_channel);
+    if (ctx->event_loop != NULL) {
+        mk_event_loop_destroy(ctx->event_loop);
+        ctx->event_loop = NULL;
+    }
 
-    mk_event_loop_destroy(ctx->event_loop);
     return 0;
 }
 
@@ -249,8 +262,11 @@ flb_ctx_t *flb_create()
     }
 
     ret = flb_create_event_loop(ctx);
-    if (ret != 0)
+    if (ret != 0) {
+        flb_config_exit(ctx->config);
+        flb_free(ctx);
         return NULL;
+    }
 
     #ifdef FLB_HAVE_AWS_ERROR_REPORTER
     if (is_error_reporting_enabled()) {

src/fluent-bit.c

@@ -1422,8 +1422,10 @@ static int flb_main_run(int argc, char **argv)
         flb_utils_set_daemon(config);
 #if defined(__FreeBSD__) || defined(__NetBSD__) || \
     defined(__OpenBSD__) || defined(__DragonFly__)
-        if (flb_create_event_loop(ctx) != 0)
+        if (flb_create_event_loop(ctx) != 0) {
+            flb_error("[daemon] failed to recreate event loop after daemonizing");
             flb_utils_error(FLB_ERR_CFG_FLUSH);
+        }
 #endif
     }
 #endif