Attachment 108898 Details for Bug 85105 – [PATCH 3/3 for 1.9] Use DBUS_SYSTEM_LOG_WARNING for failure to alter fd-limits

[patch] [PATCH 3/3 for 1.9] Use DBUS_SYSTEM_LOG_WARNING for failure to alter fd-limits

0003-Use-DBUS_SYSTEM_LOG_WARNING-for-failure-to-alter-fd-.patch (text/plain), 1.71 KB, created by Simon McVittie on 2014-11-04 14:53:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2014-11-04 14:53:25 UTC

Size: 1.71 KB

patch

obsolete

>From bbbce0ac7a9c501db16cdf934ff7d7d4c99a7bc5 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Tue, 4 Nov 2014 14:51:22 +0000
>Subject: [PATCH 3/3] Use DBUS_SYSTEM_LOG_WARNING for failure to alter
> fd-limits
>
>---
> bus/activation.c | 2 +-
> bus/bus.c        | 4 ++--
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/bus/activation.c b/bus/activation.c
>index ecd19bb..630bd06 100644
>--- a/bus/activation.c
>+++ b/bus/activation.c
>@@ -1704,7 +1704,7 @@ child_setup (void *user_data)
>     {
>       /* unfortunately we don't actually know the service name here */
>       bus_context_log (activation->context,
>-                       DBUS_SYSTEM_LOG_INFO,
>+                       DBUS_SYSTEM_LOG_WARNING,
>                        "Failed to reset fd limit before activating "
>                        "service: %s: %s",
>                        error.name, error.message);
>diff --git a/bus/bus.c b/bus/bus.c
>index 47cc345..e8b6f08 100644
>--- a/bus/bus.c
>+++ b/bus/bus.c
>@@ -671,7 +671,7 @@ raise_file_descriptor_limit (BusContext      *context)
> 
>   if (context->initial_fd_limit == NULL)
>     {
>-      bus_context_log (context, DBUS_SYSTEM_LOG_INFO,
>+      bus_context_log (context, DBUS_SYSTEM_LOG_WARNING,
>                        "%s: %s", error.name, error.message);
>       dbus_error_free (&error);
>       return;
>@@ -686,7 +686,7 @@ raise_file_descriptor_limit (BusContext      *context)
>    */
>   if (!_dbus_rlimit_raise_fd_limit_if_privileged (65536, &error))
>     {
>-      bus_context_log (context, DBUS_SYSTEM_LOG_INFO,
>+      bus_context_log (context, DBUS_SYSTEM_LOG_WARNING,
>                        "%s: %s", error.name, error.message);
>       dbus_error_free (&error);
>       return;
>-- 
>2.1.1
>

Actions: View | Splinter Review

Attachments on bug 85105: 107944 | 108299 | 108848 | 108849 | 108853 | 108886 | 108896 | 108897 | 108898 | 109054

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.