Skip to content

Commit

Permalink
in_tail: disable Parser if multiline mode is enabled (#696)
Browse files Browse the repository at this point in the history
Signed-off-by: Eduardo Silva <[email protected]>
  • Loading branch information
edsiper committed Aug 7, 2018
1 parent 3104bb9 commit df027ec
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
7 changes: 7 additions & 0 deletions plugins/in_tail/tail.c
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,13 @@ static int in_tail_init(struct flb_input_instance *in,
}
ctx->coll_fd_pending = ret;


if (ctx->multiline == FLB_TRUE && ctx->parser) {
ctx->parser = NULL;
flb_warn("[in_tail] on multiline mode 'Parser' is not allowed "
"(parser disabled)");
}

/* Register callback to process multiline queued buffer */
if (ctx->multiline == FLB_TRUE) {
ret = flb_input_set_collector_time(in, flb_tail_mult_pending_flush,
Expand Down
7 changes: 0 additions & 7 deletions plugins/in_tail/tail_multiline.c
Original file line number Diff line number Diff line change
Expand Up @@ -97,13 +97,6 @@ int flb_tail_mult_create(struct flb_tail_config *ctx,
}
}

/* Double check and warn if the user is using something not expected */
tmp = flb_input_get_property("parser", i_ins);
if (tmp) {
flb_warn("[in_tail] the 'Parser %s' config is omitted in Multiline mode",
tmp);
}

return 0;
}

Expand Down

0 comments on commit df027ec

Please sign in to comment.