Skip to content

fluent-bit: remove cleanup code from flb_signal_exit #7735

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

Merged
edsiper merged 2 commits into from
Jul 25, 2023
Merged

fluent-bit: remove cleanup code from flb_signal_exit #7735

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
746b8b6
fluent-bit: remove cleanup code from flb_signal_exit
nokute78 Jul 21, 2023
a1f3f11
fluent-bit: release trace_props
nokute78 Jul 21, 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
25 changes: 4 additions & 21 deletions src/fluent-bit.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,8 +524,6 @@ static void flb_signal_exit(int signal)
char s[] = "[engine] caught signal (";
time_t now;
struct tm *cur;
flb_ctx_t *ctx = flb_context_get();
struct flb_cf *cf_opts = flb_cf_context_get();

now = time(NULL);
cur = localtime(&now);
Expand All @@ -550,25 +548,6 @@ static void flb_signal_exit(int signal)
flb_print_signal(SIGTERM);
flb_print_signal(SIGSEGV);
};

/* Signal handlers */
/* SIGSEGV is not handled here to preserve stacktrace */
switch (signal) {
case SIGINT:
case SIGTERM:
#ifndef FLB_SYSTEM_WINDOWS
case SIGQUIT:
case SIGHUP:
#endif
if (cf_opts != NULL) {
flb_cf_destroy(cf_opts);
}
flb_stop(ctx);
flb_destroy(ctx);
Comment on lines -563 to -567
Copy link
Collaborator Author

@nokute78 nokute78 Jul 21, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These functions will be called

fluent-bit/src/fluent-bit.c

Lines 1348 to 1352 in 824ba3d

cf_opts = flb_cf_context_get();
if (cf_opts != NULL) {
flb_cf_destroy(cf_opts);
}

and

fluent-bit/src/fluent-bit.c

Lines 1364 to 1365 in 824ba3d

flb_stop(ctx);
flb_destroy(ctx);

_exit(EXIT_SUCCESS);
default:
break;
}
}

static void flb_signal_handler(int signal)
Expand Down Expand Up @@ -1359,6 +1338,10 @@ int flb_main(int argc, char **argv)
if (trace_output) {
flb_free(trace_output);
}
if (trace_props != NULL) {
flb_kv_release(trace_props);
flb_free(trace_props);
}
#endif

flb_stop(ctx);
Expand Down