diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-11-18 19:12:01 +0000 |
---|---|---|
committer | Simon McVittie <smcv@debian.org> | 2016-08-16 18:27:47 +0100 |
commit | 920af242e86a2ee3bd07968d4960446042c67658 (patch) | |
tree | 31ac3f1529f4793f8b86ee29a13d232f49964a22 /bus/activation.c | |
parent | a363822f5f58e5513e30dc2f84a30ae03cd91e07 (diff) | |
download | dbus-920af242e86a2ee3bd07968d4960446042c67658.tar.gz |
Log service_start_timeout (aka activation_timeout) when we exceed it
Also upgrade it to a warning.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=86442
Diffstat (limited to 'bus/activation.c')
-rw-r--r-- | bus/activation.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/bus/activation.c b/bus/activation.c index 614ce656..08b8fc22 100644 --- a/bus/activation.c +++ b/bus/activation.c @@ -1433,7 +1433,12 @@ static dbus_bool_t pending_activation_timed_out (void *data) { BusPendingActivation *pending_activation = data; + BusContext *context; DBusError error; + int timeout; + + context = pending_activation->activation->context; + timeout = bus_context_get_activation_timeout (context); /* Kill the spawned process, since it sucks * (not sure this is what we want to do, but @@ -1444,10 +1449,11 @@ pending_activation_timed_out (void *data) dbus_error_init (&error); - bus_context_log_and_set_error (pending_activation->activation->context, - DBUS_SYSTEM_LOG_INFO, &error, DBUS_ERROR_TIMED_OUT, - "Failed to activate service '%s': timed out", - pending_activation->service_name); + bus_context_log_and_set_error (context, DBUS_SYSTEM_LOG_WARNING, &error, + DBUS_ERROR_TIMED_OUT, + "Failed to activate service '%s': timed out " + "(service_start_timeout=%dms)", + pending_activation->service_name, timeout); pending_activation_failed (pending_activation, &error); |