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

bus-wait-for-jobs: fix service result table

Browse Source 
We were missing one service result (oom-kill), and the ratelimit one is
called differently. Correct that so that we generate proper log messages
for these cases.
This commit is contained in:
Lennart Poettering
2025-01-14 13:56:58 +01:00
parent 1d522f1a86
commit a7620f5dd1
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/shared/bus-wait-for-jobs.c
View File

@@ -161,14 +161,15 @@ static void log_job_error_with_service_result(const char* service, const char *r
static const struct {
const char *result, *explanation;
} explanations[] = {
{ "resources", "of unavailable resources or another system error" },
{ "protocol", "the service did not take the steps required by its unit configuration" },
{ "timeout", "a timeout was exceeded" },
{ "exit-code", "the control process exited with error code" },
{ "signal", "a fatal signal was delivered to the control process" },
{ "core-dump", "a fatal signal was delivered causing the control process to dump core" },
{ "watchdog", "the service failed to send watchdog ping" },
{ "start-limit", "start of the service was attempted too often" },
{ "resources", "of unavailable resources or another system error" },
{ "protocol", "the service did not take the steps required by its unit configuration" },
{ "timeout", "a timeout was exceeded" },
{ "exit-code", "the control process exited with error code" },
{ "signal", "a fatal signal was delivered to the control process" },
{ "core-dump", "a fatal signal was delivered causing the control process to dump core" },
{ "watchdog", "the service failed to send watchdog ping" },
{ "start-limit-hit", "start of the service was attempted too often" },
{ "oom-kill", "of an out-of-memory (OOM) siutation" },
};
_cleanup_free_ char *service_shell_quoted = NULL;
@@ -205,7 +206,7 @@ static void log_job_error_with_service_result(const char* service, const char *r
extra:
/* For some results maybe additional explanation is required */
if (streq_ptr(result, "start-limit"))
if (streq_ptr(result, "start-limit-hit"))
log_info("To force a start use \"%1$s reset-failed %2$s\"\n"
"followed by \"%1$s start %2$s\" again.",
systemctl,