From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Tue, 18 Nov 2014 12:35:28 +0000 (+0000)
Subject: Log max_pending_service_starts (aka max_pending_activations) when exceeded
X-Git-Tag: dbus-1.11.6~30
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fa8637256f3a4c0afacabb3966658799034dd39e;p=thirdparty%2Fdbus.git

Log max_pending_service_starts (aka max_pending_activations) when exceeded

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=86442
---

diff --git a/bus/activation.c b/bus/activation.c
index 08b8fc22f..3bddb35db 100644
--- a/bus/activation.c
+++ b/bus/activation.c
@@ -1660,15 +1660,19 @@ bus_activation_activate_service (BusActivation  *activation,
   dbus_bool_t retval;
   dbus_bool_t was_pending_activation;
   DBusString command;
+  int limit;
 
   _DBUS_ASSERT_ERROR_IS_CLEAR (error);
 
-  if (activation->n_pending_activations >=
-      bus_context_get_max_pending_activations (activation->context))
+  limit = bus_context_get_max_pending_activations (activation->context);
+
+  if (activation->n_pending_activations >= limit)
     {
       dbus_set_error (error, DBUS_ERROR_LIMITS_EXCEEDED,
-                      "The maximum number of pending activations has been reached, activation of %s failed",
-                      service_name);
+                      "The maximum number of pending activations has been "
+                      "reached, activation of %s failed "
+                      "(max_pending_service_starts=%d)",
+                      service_name, limit);
       return FALSE;
     }