in_tail: close inotify fd on exit

This patch fixes a problem where the fd returned by inotify_init1(2) was not closed. Tested with the unit test and valgrind. Signed-off-by: Emma Haruka Iwao <yuryu@google.com>
fluent · Oct 30, 2021 · 516fb40 · 516fb40
1 parent 231ef4b
commit 516fb40
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/plugins/in_tail/tail.c b/plugins/in_tail/tail.c
@@ -410,6 +410,7 @@ static int in_tail_exit(void *data, struct flb_config *config)
     struct flb_tail_config *ctx = data;
 
     flb_tail_file_remove_all(ctx);
+    flb_tail_fs_exit(ctx);
     flb_tail_config_destroy(ctx);
 
     return 0;

diff --git a/plugins/in_tail/tail_fs_inotify.c b/plugins/in_tail/tail_fs_inotify.c
@@ -363,6 +363,5 @@ int flb_tail_fs_inotify_remove(struct flb_tail_file *file)
 
 int flb_tail_fs_inotify_exit(struct flb_tail_config *ctx)
 {
-    (void) ctx;
-    return 0;
+    return close(ctx->fd_notify);
 }