From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Fri, 27 Dec 2013 22:14:24 +0000 (-0500)
Subject: core: show timeouts when watchdog howls
X-Git-Tag: v216~487
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=a7850c7d1339b490ac021ff82c2081285ea28503;hp=f7a5bb2842037fa27dbc99d92c3fee7fe1bbbc2a

core: show timeouts when watchdog howls
---

diff --git a/src/core/service.c b/src/core/service.c
index 0f542edb4..6a4665a1a 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -2551,11 +2551,15 @@ static int service_dispatch_timer(sd_event_source *source, usec_t usec, void *us
 
 static int service_dispatch_watchdog(sd_event_source *source, usec_t usec, void *userdata) {
         Service *s = SERVICE(userdata);
+        char t[FORMAT_TIMESPAN_MAX];
 
         assert(s);
         assert(source == s->watchdog_event_source);
 
-        log_error_unit(UNIT(s)->id, "%s watchdog timeout!", UNIT(s)->id);
+        log_error_unit(UNIT(s)->id,
+                       "%s watchdog timeout (limit %s)!",
+                       UNIT(s)->id,
+                       format_timespan(t, sizeof(t), s->watchdog_usec, 1));
         service_enter_signal(s, SERVICE_STOP_SIGTERM, SERVICE_FAILURE_WATCHDOG);
 
         return 0;