Attachment 109684 Details for Bug 86442 – Log service_start_timeout (aka activation_timeout) when we exceed it

[patch] Log service_start_timeout (aka activation_timeout) when we exceed it

0006-Log-service_start_timeout-aka-activation_timeout-whe.patch (text/plain), 1.71 KB, created by Simon McVittie on 2014-11-18 19:22:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2014-11-18 19:22:34 UTC

Size: 1.71 KB

patch

obsolete

>From c3b2326e94ac2b2f498ddc1b3e156961d0c786b6 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Tue, 18 Nov 2014 19:12:01 +0000
>Subject: [PATCH 06/11] 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
>---
> bus/activation.c | 13 +++++++++----
> 1 file changed, 9 insertions(+), 4 deletions(-)
>
>diff --git a/bus/activation.c b/bus/activation.c
>index 9610c04..4a3bf4a 100644
>--- a/bus/activation.c
>+++ b/bus/activation.c
>@@ -1467,7 +1467,9 @@ static dbus_bool_t
> pending_activation_timed_out (void *data)
> {
>   BusPendingActivation *pending_activation = data;
>+  BusContext *context;
>   DBusError error;
>+  int timeout;
> 
>   /* Kill the spawned process, since it sucks
>    * (not sure this is what we want to do, but
>@@ -1478,13 +1480,16 @@ pending_activation_timed_out (void *data)
> 
>   dbus_error_init (&error);
> 
>+  context = pending_activation->activation->context;
>+  timeout = bus_context_get_activation_timeout (context);
>+
>   dbus_set_error (&error, DBUS_ERROR_TIMED_OUT,
>                   "Activation of %s timed out",
>                   pending_activation->service_name);
>-  bus_context_log (pending_activation->activation->context,
>-                   DBUS_SYSTEM_LOG_INFO,
>-                   "Failed to activate service '%s': timed out",
>-                   pending_activation->service_name);
>+  bus_context_log (context, DBUS_SYSTEM_LOG_WARNING,
>+                   "Failed to activate service '%s': timed out "
>+                   "(service_start_timeout=%dms)",
>+                   pending_activation->service_name, timeout);
> 
>   pending_activation_failed (pending_activation, &error);
> 
>-- 
>2.1.3
>

Actions: View | Splinter Review

Attachments on bug 86442: 109682 | 109683 | 109684 | 109685 | 109686 | 109687 | 109688 | 109689 | 124822 | 124823 | 124824 | 124825 | 124826 | 124827 | 124828 | 124829 | 124830 | 124831 | 124832 | 124833 | 124834 | 124838

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.