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

Jump to bottom

reload: do not call flb_stop when flb_start fails and fix crash on RHEL #9435

Merged
merged 1 commit into from
Sep 27, 2024
Merged

reload: do not call flb_stop when flb_start fails and fix crash on RHEL #9435

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
4 changes: 0 additions & 4 deletions src/flb_reload.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,6 @@ int flb_reload(flb_ctx_t *ctx, struct flb_cf *cf_opts)
flb_sds_destroy(file);
}
flb_cf_destroy(new_cf);
flb_stop(new_ctx);
flb_destroy(new_ctx);
flb_error("[reload] reloaded config is invalid. Reloading is halted");

Expand All @@ -488,7 +487,6 @@ int flb_reload(flb_ctx_t *ctx, struct flb_cf *cf_opts)
if (ret != 0) {
flb_sds_destroy(file);
flb_cf_destroy(new_cf);
flb_stop(new_ctx);
flb_destroy(new_ctx);

flb_error("[reload] reloaded config format is invalid. Reloading is halted");
Expand All @@ -501,7 +499,6 @@ int flb_reload(flb_ctx_t *ctx, struct flb_cf *cf_opts)
if (ret != 0) {
flb_sds_destroy(file);
flb_cf_destroy(new_cf);
flb_stop(new_ctx);
flb_destroy(new_ctx);

flb_error("[reload] reloaded config is invalid. Reloading is halted");
Expand Down Expand Up @@ -530,7 +527,6 @@ int flb_reload(flb_ctx_t *ctx, struct flb_cf *cf_opts)
ret = flb_start(new_ctx);

if (ret != 0) {
flb_stop(new_ctx);
flb_destroy(new_ctx);

flb_error("[reload] loaded configuration contains error(s). Reloading is aborted");
Expand Down
Loading