From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sun, 14 Apr 2019 11:47:13 +0000 (+0900)
Subject: core: do not show TimeoutStopSec= in dump message if it is not set
X-Git-Tag: v243~666^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dcab85be18ff2e9f5aa164801b17c37cd650a660;p=platform%2Fupstream%2Fsystemd.git

core: do not show TimeoutStopSec= in dump message if it is not set
---

diff --git a/src/core/service.c b/src/core/service.c
index 0efd861..c4d8378 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -861,16 +861,19 @@ static void service_dump(Unit *u, FILE *f, const char *prefix) {
         fprintf(f,
                 "%sRestartSec: %s\n"
                 "%sTimeoutStartSec: %s\n"
-                "%sTimeoutStopSec: %s\n"
-                "%sTimeoutAbortSec: %s\n"
-                "%sRuntimeMaxSec: %s\n"
-                "%sWatchdogSec: %s\n",
+                "%sTimeoutStopSec: %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, s->timeout_abort_set
-                                ? format_timespan(buf_abort, sizeof(buf_abort), s->timeout_abort_usec, USEC_PER_SEC)
-                                : "",
+                prefix, format_timespan(buf_stop, sizeof(buf_stop), s->timeout_stop_usec, USEC_PER_SEC));
+
+        if (s->timeout_abort_set)
+                fprintf(f,
+                        "%sTimeoutAbortSec: %s\n",
+                        prefix, format_timespan(buf_abort, sizeof(buf_abort), s->timeout_abort_usec, USEC_PER_SEC));
+
+        fprintf(f,
+                "%sRuntimeMaxSec: %s\n"
+                "%sWatchdogSec: %s\n",
                 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));