Keep the program destination open between configuration reloads #722
Conversation
This file contains 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
| @@ -112,6 +113,7 @@ dest_afprogram_options | |||
| dest_afprogram_option | |||
| : dest_writer_option | |||
| | dest_driver_option | |||
| | KW_KEEPALIVE '(' yesno ')' { ((AFProgramDestDriver *)last_driver)->keep_alive = $3; } | |||
| ; | |||
There was a problem hiding this comment.
please use a setter in this case, this is the preferred pattern over mucking within the private struct of the driver.
Also, keepalive is not the the best name, we are using keep-alive (e.g. with the dash in the socket module, so we should use the same).
There was a problem hiding this comment.
Fixed in d143a96270607999fba326659cd00f1f6a5d70b4.
| @@ -38,6 +38,45 @@ | |||
| #include <unistd.h> | |||
| #include <signal.h> | |||
|
|
|||
| typedef struct _AFProgramReloadStoreItem | |||
| { | |||
| LogWriter * writer; | |||
added 10 commits
November 4, 2015 13:26
Signed-off-by: Fried Zoltán <zoltan.fried@balabit.com> Signed-off-by: MÓZES Ádám István <adam.mozes@balabit.com>
The writer deinitialization should be happen before the termination of the child, because at the end of the deinitialization, a force flush can be happen, and if the child is terminated before the force flush, a SIGPIPE can cause the recreation of the destination program. Signed-off-by: MÓZES Ádám István <adam.mozes@balabit.com>
This option will control whether the destination program should be terminated at reload, or should be left running. Signed-off-by: MÓZES Ádám István <adam.mozes@balabit.com>
This commit introduces an additional abstraction layer to the child terminating process, making it unified. Signed-off-by: MÓZES Ádám István <adam.mozes@balabit.com>
This commit will add the AFProgramReloadStoreItem structure and a basic free function. This structure will hold essential information about the program destination, which allows us to restore it later. Signed-off-by: MÓZES Ádám István <adam.mozes@balabit.com>
This commit will add a simple implementation of restoring the AFProgramReloadStoreItem structure when syslog-ng is being reloaded. Signed-off-by: MÓZES Ádám István <adam.mozes@balabit.com>
This commit contains a naive implementation of the AFProgramReloadStoreItem saving logic when the program destination is being deinitalized. Signed-off-by: Fried Zoltán <zoltan.fried@balabit.com> Signed-off-by: MÓZES Ádám István <adam.mozes@balabit.com>
The child_manager_unregister has been moved to afprogram_dd_deinit in order to restore the single responsibility of the afprogram_dd_kill_child. Signed-off-by: MÓZES Ádám István <adam.mozes@balabit.com>
This commit will extract the program opening logic into a separate method (called afprogram_dd_open_program), therefore this is merely a refactor commit. Signed-off-by: MÓZES Ádám István <adam.mozes@balabit.com>
The LogQueue of the writer had the same name as the ReloadStoreItem, which is clearly a mistake. The impact of the issue was quite low, because it appeared rarely. Signed-off-by: MÓZES Ádám István <adam.mozes@balabit.com>
lbudai
added a commit
that referenced
this pull request
Nov 4, 2015
Keep the program destination open between configuration reloads
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This pull request adds the possibility of letting the program destination unclosed and reused between configuration reloads.
New option:
keep_alive(x), wherexis eitheryesorno.The default behaviour has not been changed.