shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-21 02:50:18 +03:00
Code

bus-wait-for-jobs: fix table of service result codes (#35992)

Browse Source
This commit is contained in:
Lennart Poettering 2025-01-15 12:50:32 +01:00 committed by GitHub
commit f91f1eda08
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
man/org.freedesktop.systemd1.xml
View File

@ -4838,9 +4838,10 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice {
code. <literal>signal</literal> indicates that a service process exited with an uncaught
signal. <literal>core-dump</literal> indicates that a service process exited uncleanly and dumped
core. <literal>watchdog</literal> indicates that a service did not send out watchdog ping messages
often enough. <literal>start-limit</literal> indicates that a service has been started too frequently
in a specific time frame (as configured in <varname>StartLimitInterval</varname>,
<varname>StartLimitBurst</varname>).</para>
often enough. <literal>start-limit-hit</literal> indicates that a service has been started too
frequently in a specific time frame (as configured in <varname>StartLimitInterval</varname>,
<varname>StartLimitBurst</varname>). <literal>oom-kill</literal> indicates that a service was
terminated due to an out-of-memory (OOM) situation.</para>
<para><varname>ControlGroup</varname> indicates the control group path the processes of this service
unit are placed in.</para>

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,