Attachment 107946 Details for Bug 85106 – dbus-daemon-launch-helper: on failure, log it to system log before exiting

[patch] dbus-daemon-launch-helper: on failure, log it to system log before exiting

0001-dbus-daemon-launch-helper-on-failure-log-it-to-syste.patch (text/plain), 1.42 KB, created by Simon McVittie on 2014-10-16 19:28:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2014-10-16 19:28:52 UTC

Size: 1.42 KB

patch

obsolete

>From cb7aee3c6c58e2f4763925b92a6a08191b4d80a0 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Tue, 14 Oct 2014 15:37:33 +0100
>Subject: [PATCH] dbus-daemon-launch-helper: on failure, log it to system log
> before exiting
>
>The communication channel between the launch helper and the dbus-daemon
>is rather limited, so any extra hints are welcome.
>---
> bus/activation-helper-bin.c | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
>diff --git a/bus/activation-helper-bin.c b/bus/activation-helper-bin.c
>index f5f16d2..d8cb69c 100644
>--- a/bus/activation-helper-bin.c
>+++ b/bus/activation-helper-bin.c
>@@ -32,9 +32,14 @@
> #include <stdlib.h>
> #include <string.h>
> 
>+#include <dbus/dbus-sysdeps.h>
>+
> static int
> convert_error_to_exit_code (DBusError *error)
> {
>+  _dbus_system_log (DBUS_SYSTEM_LOG_SECURITY, "%s: %s", error->name,
>+                    error->message);
>+
>   if (dbus_error_has_name (error, DBUS_ERROR_NO_MEMORY))
>     return BUS_SPAWN_EXIT_CODE_NO_MEMORY;
> 
>@@ -66,7 +71,6 @@ convert_error_to_exit_code (DBusError *error)
>     return BUS_SPAWN_EXIT_CODE_CHILD_SIGNALED;
>   
>   /* should we assert? */
>-  fprintf(stderr, "%s: %s\n", error->name, error->message);
>   
>   return BUS_SPAWN_EXIT_CODE_GENERIC_FAILURE;
> }
>@@ -77,6 +81,8 @@ main (int argc, char **argv)
>   DBusError error;
>   int retval;
> 
>+  _dbus_init_system_log (FALSE);
>+
>   /* default is all okay */
>   retval = 0;
> 
>-- 
>2.1.1
>

Actions: View | Splinter Review

Attachments on bug 85106: 107946

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.