Skip to content

in_tail: permission error handling #10690

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

in_tail: permission error handling #10690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8dee5dc
in_tail: rerun glob without GLOB_ERR if there is permission error
kyo-ke Aug 4, 2025
ef52e1d
feat(in_tail): add configurable permission error handling
sandy2008 Aug 4, 2025
90999fb
feat(in_tail): add configurable permission error handling
sandy2008 Aug 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions plugins/in_tail/tail.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -719,6 +719,14 @@ static struct flb_config_map config_map[] = {
0, FLB_TRUE, offsetof(struct flb_tail_config, skip_empty_lines),
"Allows to skip empty lines."
},
{
FLB_CONFIG_MAP_BOOL, "skip_permission_errors", "false",
0, FLB_TRUE, offsetof(struct flb_tail_config, skip_permission_errors),
"Skip directories with permission errors instead of failing. When enabled, "
"the plugin will continue processing accessible directories even if some directories "
"cannot be read due to permission issues. When disabled (default), any permission error will "
"cause the plugin to fail entirely."
},
#ifdef __linux__
{
FLB_CONFIG_MAP_BOOL, "file_cache_advise", "true",
Expand Down
3 changes: 3 additions & 0 deletions plugins/in_tail/tail_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,9 @@ struct flb_tail_config {
/* List of shell patterns used to exclude certain file names */
struct mk_list *exclude_list;

/* Permission handling configuration */
int skip_permission_errors; /* skip directories with permission errors (1), or fail (0) */

/* Plugin input instance */
struct flb_input_instance *ins;

Expand Down
8 changes: 7 additions & 1 deletion plugins/in_tail/tail_scan_glob.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,8 +203,14 @@ static int tail_scan_path(const char *path, struct flb_tail_config *ctx)
/* Safe reset for globfree() */
globbuf.gl_pathv = NULL;

/* Scan the given path */
/* Scan the given path with error checking enabled. */
ret = do_glob(path, GLOB_TILDE | GLOB_ERR, NULL, &globbuf);
if (ret == GLOB_ABORTED && !ctx->skip_permission_errors) {
flb_plg_warn(ctx->ins, "read error, check permissions: %s", path);
globfree(&globbuf);
ret = do_glob(path, GLOB_TILDE, NULL, &globbuf);
}

if (ret != 0) {
switch (ret) {
case GLOB_NOSPACE:
Expand Down
Loading