cfg: fix config-version incosistencies#5145
Merged
HofiOne merged 2 commits intosyslog-ng:masterfrom Sep 30, 2024
Merged
Conversation
HofiOne
pushed a commit
to HofiOne/syslog-ng
that referenced
this pull request
Sep 30, 2024
Signed-off-by: László Várady <[email protected]> Signed-off-by: Hofi <[email protected]>
HofiOne
force-pushed
the
fix-no-version-inconsistency
branch
from
c17babf to
0652c93
Compare
Template functions, for example, are constructed right when syslog-ng parses the configuration, so the `@version` directive must be placed at the top of the config file to make it consistent. This patch fixes the implicit "current version" mechanism (when no `@version` is specified) by moving it back to the lexer, and warns the user about misplaced or redefined `@version` directives. Signed-off-by: László Várady <[email protected]>
HofiOne
pushed a commit
to HofiOne/syslog-ng
that referenced
this pull request
Sep 30, 2024
Signed-off-by: László Várady <[email protected]> Signed-off-by: Hofi <[email protected]>
HofiOne
force-pushed
the
fix-no-version-inconsistency
branch
from
0652c93 to
b41348d
Compare
therandomstring
approved these changes
Sep 30, 2024
Signed-off-by: Hofi <[email protected]>
HofiOne
force-pushed
the
fix-no-version-inconsistency
branch
from
b41348d to
e03bbe7
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Template functions, for example, are constructed right when syslog-ng parses the configuration, so the @Version directive must be placed at the top of the config file to make it consistent.
This patch fixes the implicit "current version" mechanism (when no @Version is specified) by moving it back to the lexer, and warns the user about misplaced or redefined @Version directives.
Reproducer: Place a template("$(format-json asd=asd)" anywhere in the configuration without an explicit @Version declaration or place the @Version declaration after the config block containing the mentioned template. A compatibility warning will be produced and syslog-ng will operate in half-"compat mode".
Backport of #312 by @MrAnno