From 918997921306b43a6b1648d282d40e0e977d1b2d Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 30 Jan 2018 17:09:59 +0900 Subject: [PATCH 1/3] core/mount: dump TimeoutSec= --- src/core/mount.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/core/mount.c b/src/core/mount.c index 4c12542bd7..e72d8161ed 100644 --- a/src/core/mount.c +++ b/src/core/mount.c @@ -707,6 +707,7 @@ static int mount_coldplug(Unit *u) { } static void mount_dump(Unit *u, FILE *f, const char *prefix) { + char buf[FORMAT_TIMESPAN_MAX] = {}; Mount *m = MOUNT(u); MountParameters *p; @@ -728,7 +729,8 @@ static void mount_dump(Unit *u, FILE *f, const char *prefix) { "%sDirectoryMode: %04o\n" "%sSloppyOptions: %s\n" "%sLazyUnmount: %s\n" - "%sForceUnmount: %s\n", + "%sForceUnmount: %s\n" + "%sTimoutSec: %s\n", prefix, mount_state_to_string(m->state), prefix, mount_result_to_string(m->result), prefix, m->where, @@ -741,7 +743,8 @@ static void mount_dump(Unit *u, FILE *f, const char *prefix) { prefix, m->directory_mode, prefix, yes_no(m->sloppy_options), prefix, yes_no(m->lazy_unmount), - prefix, yes_no(m->force_unmount)); + prefix, yes_no(m->force_unmount), + prefix, format_timespan(buf, sizeof(buf), m->timeout_usec, USEC_PER_SEC)); if (m->control_pid > 0) fprintf(f, From 9bd0e1b8146168f43e2cd7c84d9eee9ccacbca1e Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 30 Jan 2018 17:10:09 +0900 Subject: [PATCH 2/3] core/swap: dump TimeoutSec= --- src/core/swap.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/core/swap.c b/src/core/swap.c index 70097ff2ba..b10066db01 100644 --- a/src/core/swap.c +++ b/src/core/swap.c @@ -557,6 +557,7 @@ static int swap_coldplug(Unit *u) { } static void swap_dump(Unit *u, FILE *f, const char *prefix) { + char buf[FORMAT_TIMESPAN_MAX] = {}; Swap *s = SWAP(u); SwapParameters *p; @@ -592,6 +593,10 @@ static void swap_dump(Unit *u, FILE *f, const char *prefix) { prefix, p->priority, prefix, strempty(p->options)); + fprintf(f, + "%sTimeoutSec: %s\n", + prefix, format_timespan(buf, sizeof(buf), s->timeout_usec, USEC_PER_SEC)); + if (s->control_pid > 0) fprintf(f, "%sControl PID: "PID_FMT"\n", From c9d416991908908c2406884f1b70c99420128057 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 30 Jan 2018 17:10:47 +0900 Subject: [PATCH 3/3] core/service: dump more settings --- src/core/service.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/core/service.c b/src/core/service.c index 6476dc68c5..0b53b1c829 100644 --- a/src/core/service.c +++ b/src/core/service.c @@ -774,6 +774,8 @@ static int service_load(Unit *u) { } static void service_dump(Unit *u, FILE *f, const char *prefix) { + char buf_restart[FORMAT_TIMESPAN_MAX] = {}, buf_start[FORMAT_TIMESPAN_MAX] = {}, buf_stop[FORMAT_TIMESPAN_MAX] = {}; + char buf_runtime[FORMAT_TIMESPAN_MAX] = {}, buf_watchdog[FORMAT_TIMESPAN_MAX] = {}; ServiceExecCommand c; Service *s = SERVICE(u); const char *prefix2; @@ -838,6 +840,18 @@ static void service_dump(Unit *u, FILE *f, const char *prefix) { "%sAccept Socket: %s\n", prefix, UNIT_DEREF(s->accept_socket)->id); + fprintf(f, + "%sRestartSec: %s\n" + "%sTimeoutStartSec: %s\n" + "%sTimeoutStopSec: %s\n" + "%sRuntimeMaxSec: %s\n" + "%sWatchdogSec: %s\n", + prefix, format_timespan(buf_restart, sizeof(buf_restart), s->restart_usec, USEC_PER_SEC), + prefix, format_timespan(buf_start, sizeof(buf_start), s->timeout_start_usec, USEC_PER_SEC), + prefix, format_timespan(buf_stop, sizeof(buf_stop), s->timeout_stop_usec, USEC_PER_SEC), + prefix, format_timespan(buf_runtime, sizeof(buf_runtime), s->runtime_max_usec, USEC_PER_SEC), + prefix, format_timespan(buf_watchdog, sizeof(buf_watchdog), s->watchdog_usec, USEC_PER_SEC)); + kill_context_dump(&s->kill_context, f, prefix); exec_context_dump(&s->exec_context, f, prefix);