X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fsystemctl.c;h=6f87b06dd3401c5640bf1e89bdb6fc98940be98f;hp=2f11d6bc1d09bd2bffeb914d3c9c6d8d8eaa3e38;hb=6f003b43043da7b57c0ebe15b86856c8248fea4a;hpb=c971700e41e0ac9883ab0744921b79dd396170dc diff --git a/src/systemctl.c b/src/systemctl.c index 2f11d6bc1..6f87b06dd 100644 --- a/src/systemctl.c +++ b/src/systemctl.c @@ -58,6 +58,7 @@ #include "pager.h" #include "spawn-agent.h" #include "install.h" +#include "logs-show.h" static const char *arg_type = NULL; static char **arg_property = NULL; @@ -2199,7 +2200,7 @@ static void print_status_info(UnitStatusInfo *i) { if (i->running) { char *t = NULL; - get_process_name(i->main_pid, &t); + get_process_comm(i->main_pid, &t); if (t) { printf(" (%s)", t); free(t); @@ -2233,7 +2234,7 @@ static void print_status_info(UnitStatusInfo *i) { printf(" Control: %u", (unsigned) i->control_pid); - get_process_name(i->control_pid, &t); + get_process_comm(i->control_pid, &t); if (t) { printf(" (%s)", t); free(t); @@ -2261,6 +2262,11 @@ static void print_status_info(UnitStatusInfo *i) { } } + if (i->id && arg_transport != TRANSPORT_SSH) { + printf("\n"); + show_journal_by_service(i->id, OUTPUT_SHORT, NULL, 0, 0, 0, arg_all); + } + if (i->need_daemon_reload) printf("\n%sWarning:%s Unit file changed on disk, 'systemctl %s daemon-reload' recommended.\n", ansi_highlight(true),