Attachment 124828 Details for Bug 86442 – Log when we exceed max_names_per_connection (aka max_services_per_connection)

[patch] Log when we exceed max_names_per_connection (aka max_services_per_connection)

0007-Log-when-we-exceed-max_names_per_connection-aka-max_.patch (text/plain), 2.02 KB, created by Simon McVittie on 2016-07-01 12:20:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2016-07-01 12:20:42 UTC

Size: 2.02 KB

patch

obsolete

>From de2a70402b862bfbf5b7be7d4bd52307bb2456ae Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Tue, 18 Nov 2014 19:19:37 +0000
>Subject: [PATCH 07/13] Log when we exceed max_names_per_connection (aka
> max_services_per_connection)
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=86442
>---
> bus/services.c | 22 ++++++++++++++++------
> 1 file changed, 16 insertions(+), 6 deletions(-)
>
>diff --git a/bus/services.c b/bus/services.c
>index 6a4c884..127edda 100644
>--- a/bus/services.c
>+++ b/bus/services.c
>@@ -392,7 +392,8 @@ bus_registry_acquire_service (BusRegistry      *registry,
>   BusActivation  *activation;
>   BusSELinuxID *sid;
>   BusOwner *primary_owner;
>- 
>+  int limit;
>+
>   retval = FALSE;
> 
>   if (!_dbus_validate_bus_name (service_name, 0,
>@@ -478,15 +479,24 @@ bus_registry_acquire_service (BusRegistry      *registry,
>       goto out;
>     }
> 
>-  if (bus_connection_get_n_services_owned (connection) >=
>-      bus_context_get_max_services_per_connection (registry->context))
>+  limit = bus_context_get_max_services_per_connection (registry->context);
>+
>+  if (bus_connection_get_n_services_owned (connection) >= limit)
>     {
>-      dbus_set_error (error, DBUS_ERROR_LIMITS_EXCEEDED,
>+      DBusError tmp_error;
>+
>+      dbus_error_init (&tmp_error);
>+      dbus_set_error (&tmp_error, DBUS_ERROR_LIMITS_EXCEEDED,
>                       "Connection \"%s\" is not allowed to own more services "
>-                      "(increase limits in configuration file if required)",
>+                      "(increase limits in configuration file if required; "
>+                      "max_names_per_connection=%d)",
>                       bus_connection_is_active (connection) ?
>                       bus_connection_get_name (connection) :
>-                      "(inactive)");
>+                      "(inactive)",
>+                      limit);
>+      bus_context_log (registry->context, DBUS_SYSTEM_LOG_WARNING,
>+          "%s", tmp_error.message);
>+      dbus_move_error (&tmp_error, error);
>       goto out;
>     }
>   
>-- 
>2.8.1
>

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.