Skip to content

in_tail: fix DB.compare_filename mismatch when monitoring symlinks #11544

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
zdyj3170101136 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

in_tail: fix DB.compare_filename mismatch when monitoring symlinks #11544

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 28 additions & 0 deletions plugins/in_tail/tail_file.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,20 @@ static inline int flb_tail_target_file_name_cmp(char *name,

base_b = basename(name_b);
ret = _stricmp(base_a, base_b);

/*
* Fallback: when monitoring symlinks the DB stores the symlink path
* (file->name) while real_name resolves to the target. Compare
* against the original path so the entry is still recognised.
*/
if (ret != 0 && file->name) {
flb_free(name_b);
name_b = flb_strdup(file->name);
if (name_b) {
base_b = basename(name_b);
ret = _stricmp(base_a, base_b);
}
Comment thread
zdyj3170101136 marked this conversation as resolved.
}
Comment thread
zdyj3170101136 marked this conversation as resolved.
#else
name_b = flb_strdup(file->real_name);
if (!name_b) {
Expand All @@ -103,6 +117,20 @@ static inline int flb_tail_target_file_name_cmp(char *name,
}
base_b = basename(name_b);
ret = strcmp(base_a, base_b);

/*
* Fallback: when monitoring symlinks the DB stores the symlink path
* (file->name) while real_name resolves to the target. Compare
* against the original path so the entry is still recognised.
*/
if (ret != 0 && file->name) {
flb_free(name_b);
name_b = flb_strdup(file->name);
if (name_b) {
base_b = basename(name_b);
ret = strcmp(base_a, base_b);
Comment thread
zdyj3170101136 marked this conversation as resolved.
}
}
#endif

out:
Expand Down
Loading