log: free log worker pipe when appropriate.

Signed-off-by: Phillip Whelan <[email protected]>
fluent · Jan 18, 2024 · a0e5129 · a0e5129
1 parent 71746b3
commit a0e5129
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/include/fluent-bit/flb_log.h b/include/fluent-bit/flb_log.h
@@ -225,6 +225,7 @@ static inline int flb_log_suppress_check(int log_suppress_interval, const char *
 #endif
 
 int flb_log_worker_init(struct flb_worker *worker);
+int flb_log_worker_destroy(struct flb_worker *worker);
 int flb_errno_print(int errnum, const char *file, int line);
 
 #ifdef __FLB_FILENAME__

diff --git a/src/flb_log.c b/src/flb_log.c
@@ -303,6 +303,12 @@ int flb_log_cache_check_suppress(struct flb_log_cache *cache, char *msg_buf, siz
     return FLB_TRUE;
 }
 
+int flb_log_worker_destroy(struct flb_worker *worker)
+{
+    flb_pipe_destroy(worker->log);
+    return 0;
+}
+
 int flb_log_worker_init(struct flb_worker *worker)
 {
     int ret;
@@ -689,6 +695,7 @@ int flb_log_destroy(struct flb_log *log, struct flb_config *config)
     if (log->worker->log_cache) {
         flb_log_cache_destroy(log->worker->log_cache);
     }
+    flb_log_worker_destroy(log->worker);
     flb_free(log->worker);
     flb_free(log);
 

diff --git a/src/flb_worker.c b/src/flb_worker.c
@@ -142,9 +142,7 @@ void flb_worker_destroy(struct flb_worker *worker)
         return;
     }
 
-    if (worker->log_cache) {
-        flb_log_cache_destroy(worker->log_cache);
-    }
+    flb_log_worker_destroy(worker);
 
     mk_list_del(&worker->_head);
     flb_free(worker);