Skip to content
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

Immutable multiline incorrect flush #60

Open
wants to merge 2 commits into
base: 2.31.12-all-cherrypicks
Choose a base branch
from
Open

Immutable multiline incorrect flush #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6431a4e
multiline: remove incorrect flush
May 24, 2023
35f2387
tests: ml: update expectation based on updated flush logic
May 25, 2023
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
1 change: 0 additions & 1 deletion src/multiline/flb_ml.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,6 @@ static int package_content(struct flb_ml_stream *mst,
}
else {
if (mst->last_stream_group != stream_group) {
flb_ml_flush_stream_group(parser, mst, mst->last_stream_group);
mst->last_stream_group = stream_group;
}
}
Expand Down
4 changes: 2 additions & 2 deletions tests/internal/multiline.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ struct record_check container_mix_input[] = {
struct record_check container_mix_output[] = {
{"a1\n"},
{"a2\n"},
{"bbcc"},
{"ddee\n"},
{"bbcc"},
{"single full"},
{"1a. some multiline log"},
{"1b. some multiline log"},
Expand Down Expand Up @@ -1345,7 +1345,7 @@ static void test_issue_5504()
}
TEST_CHECK(cb != NULL);

/* Trigger the callback without delay */
/* Trigger the callback without delay */
cb(config, ml);
/* This should not update the last_flush since it is before the timeout */
TEST_CHECK(ml->last_flush == last_flush);
Expand Down