picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

systemctl: include -M or -H arguments in the hint 

https://github.com/systemd/systemd/issues/2431

Some newlines are added, but the output will still exceed 80 columns in many
cases. The fallback for oom conditions is changed from "n/a" to something
"<service>", and a similar pattern is used for the new code. This way we
have a realistic fallback for oom, which seems nicer than making the whole
function return an error code which would then have to be propagated.

$ systemctl -M fedora-rawhide restart systemd-networkd.service
Job for systemd-networkd.service failed because start of the service was attempted too often.
See "systemctl -M fedora-rawhide status systemd-networkd.service" and "journalctl -M fedora-rawhide -xe" for details.
To force a start use "systemctl -M fedora-rawhide reset-failed systemd-networkd.service"
followed by "systemctl -M fedora-rawhide start systemd-networkd.service" again.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2016-02-15 11:57:48 -05:00
parent 8eff97a103
commit 4524439edb
3 changed files with 43 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/shared/bus-util.c
View File

@ -2028,20 +2028,23 @@ static const struct {
{ "start-limit", "start of the service was attempted too often" }
};
static void log_job_error_with_service_result(const char* service, const char *result, const char *extra_args) {
_cleanup_free_ char *service_shell_quoted = NULL, *systemctl_extra_args = NULL;
static void log_job_error_with_service_result(const char* service, const char *result, const char** extra_args) {
_cleanup_free_ char *service_shell_quoted = NULL, *_systemctl, *_journalctl;
const char *systemctl = "systemctl", *journalctl = "journalct";
assert(service);
service_shell_quoted = shell_maybe_quote(service);
systemctl_extra_args = strjoin("systemctl ", extra_args, " ", NULL);
if (!systemctl_extra_args) {
log_oom();
return;
}
if (extra_args && extra_args[1]) {
assert(extra_args[0] == NULL);
systemctl_extra_args = strstrip(systemctl_extra_args);
extra_args[0] = "systemctl";
systemctl = _systemctl = strv_join((char**) extra_args, " ");
extra_args[0] = "journalctl";
journalctl = _journalctl = strv_join((char**) extra_args, " ");
}
if (!isempty(result)) {
unsigned i;
@ -2051,30 +2054,33 @@ static void log_job_error_with_service_result(const char* service, const char *r
break;
if (i < ELEMENTSOF(explanations)) {
log_error("Job for %s failed because %s. See \"%s status %s\" and \"journalctl -xe\" for details.\n",
log_error("Job for %s failed because %s.\n"
"See \"%s status %s\" and \"%s -xe\" for details.\n",
service,
explanations[i].explanation,
systemctl_extra_args,
strna(service_shell_quoted));
systemctl ?: "systemctl <args>",
service_shell_quoted ?: "<service>",
journalctl ?: "journalctl <args>");
goto finish;
}
}
log_error("Job for %s failed. See \"%s status %s\" and \"journalctl -xe\" for details.\n",
log_error("Job for %s failed. See \"%s status %s\" and \"%s -xe\" for details.\n",
service,
systemctl_extra_args,
strna(service_shell_quoted));
systemctl ?: "systemctl <args>",
service_shell_quoted ?: "<service>",
journalctl ?: "journalctl <args>");
finish:
/* For some results maybe additional explanation is required */
if (streq_ptr(result, "start-limit"))
log_info("To force a start use \"%1$s reset-failed %2$s\" followed by \"%1$s start %2$s\" again.",
systemctl_extra_args,
strna(service_shell_quoted));
log_info("To force a start use \"%1$s reset-failed %2$s\"\n"
"followed by \"%1$s start %2$s\" again.",
systemctl ?: "systemctl <args>",
service_shell_quoted ?: "<service>");
}
static int check_wait_response(BusWaitForJobs *d, bool quiet, const char *extra_args) {
static int check_wait_response(BusWaitForJobs *d, bool quiet, const char** extra_args) {
int r = 0;
assert(d->result);
@ -2125,7 +2131,7 @@ static int check_wait_response(BusWaitForJobs *d, bool quiet, const char *extra_
return r;
}
int bus_wait_for_jobs(BusWaitForJobs *d, bool quiet, const char *extra_args) {
int bus_wait_for_jobs(BusWaitForJobs *d, bool quiet, const char** extra_args) {
int r = 0;
assert(d);

2
src/shared/bus-util.h
View File

@ -180,7 +180,7 @@ typedef struct BusWaitForJobs BusWaitForJobs;
int bus_wait_for_jobs_new(sd_bus *bus, BusWaitForJobs **ret);
void bus_wait_for_jobs_free(BusWaitForJobs *d);
int bus_wait_for_jobs_add(BusWaitForJobs *d, const char *path);
int bus_wait_for_jobs(BusWaitForJobs *d, bool quiet, const char *extra_args);
int bus_wait_for_jobs(BusWaitForJobs *d, bool quiet, const char** extra_args);
int bus_wait_for_jobs_one(BusWaitForJobs *d, const char *path, bool quiet);
DEFINE_TRIVIAL_CLEANUP_FUNC(BusWaitForJobs*, bus_wait_for_jobs_free);

18
src/systemctl/systemctl.c
View File

@ -2778,9 +2778,23 @@ static int start_unit(int argc, char *argv[], void *userdata) {
}
if (!arg_no_block) {
int q;
int q, arg_count = 1;
const char* extra_args[5] = {NULL};
q = bus_wait_for_jobs(w, arg_quiet, arg_scope != UNIT_FILE_SYSTEM ? "--user" : NULL);
/* leave first empty for the actual command name*/
if (arg_scope != UNIT_FILE_SYSTEM)
extra_args[arg_count++] = "--user";
assert(IN_SET(arg_transport, BUS_TRANSPORT_LOCAL, BUS_TRANSPORT_REMOTE, BUS_TRANSPORT_MACHINE));
if (arg_transport == BUS_TRANSPORT_REMOTE) {
extra_args[arg_count++] = "-H";
extra_args[arg_count++] = arg_host;
} else if (arg_transport == BUS_TRANSPORT_MACHINE) {
extra_args[arg_count++] = "-M";
extra_args[arg_count++] = arg_host;
}
q = bus_wait_for_jobs(w, arg_quiet, extra_args);
if (q < 0)
return q;