morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 00:14:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

journal: send READY=1 also when --lines=0 is given

Browse Source 
If --lines=0 is given, we'd skip the setup and not invoke sd_notify,
potentially blocking the caller. Change the condition for the callback
to also include that case. Since then the callback would always be
set, the 'if' statement is not necessary anymore.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2025-11-27 13:01:59 +01:00
parent b9be45f926
commit ef90afd59e
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/journal/journalctl-show.c
View File

@@ -362,7 +362,9 @@ static int on_first_event(sd_event_source *s, void *userdata) {
return log_error_errno(r, "Failed to get cursor: %m");
}
/* Setup and initial processing are done, we're ready to wait for more data. */
(void) sd_notify(/* unset_environment= */ false, "READY=1");
return 0;
}
@@ -472,11 +474,9 @@ static int setup_event(Context *c, int fd) {
else if (r < 0)
return log_error_errno(r, "Failed to add io event source for stdout: %m");
if (arg_lines != 0 || arg_since_set) {
r = sd_event_add_defer(e, NULL, on_first_event, c);
if (r < 0)
return log_error_errno(r, "Failed to add defer event source: %m");
}
r = sd_event_add_defer(e, NULL, on_first_event, c);
if (r < 0)
return log_error_errno(r, "Failed to add defer event source: %m");
c->event = TAKE_PTR(e);
return 0;
@@ -583,6 +583,7 @@ int action_show(char **matches) {
return 0;
}
/* Setup is done, we'll start processing data. */
(void) sd_notify(/* unset_environment= */ false, "READY=1");
r = show(&c);