Attachment 125200 Details for Bug 97009 – Only redirect child processes to systemd Journal if using syslog

[patch] Only redirect child processes to systemd Journal if using syslog

Only-redirect-child-processes-to-systemd-Journal-i.patch (text/plain), 8.86 KB, created by Simon McVittie on 2016-07-21 10:18:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2016-07-21 10:18:46 UTC

Size: 8.86 KB

patch

obsolete

>From e281cd6f41363ed76f8b673d57e64231ea7ad91c Mon Sep 17 00:00:00 2001
>From: Simon McVittie <smcv@debian.org>
>Date: Thu, 21 Jul 2016 10:21:35 +0100
>Subject: [PATCH] Only redirect child processes to systemd Journal if using
> syslog
>
>In particular this means the test suite won't spam the Journal
>any more.
>
>Signed-off-by: Simon McVittie <smcv@debian.org>
>---
> bus/activation.c       |  5 +++++
> bus/bus.c              |  6 ++++++
> bus/bus.h              |  1 +
> dbus/dbus-spawn-test.c |  8 ++++----
> dbus/dbus-spawn-win.c  |  1 +
> dbus/dbus-spawn.c      | 16 ++++++++++------
> dbus/dbus-spawn.h      |  6 ++++++
> test/spawn-test.c      |  4 +++-
> 8 files changed, 36 insertions(+), 11 deletions(-)
>
>diff --git a/bus/activation.c b/bus/activation.c
>index 614ce65..1b74969 100644
>--- a/bus/activation.c
>+++ b/bus/activation.c
>@@ -1654,6 +1654,7 @@ bus_activation_activate_service (BusActivation  *activation,
>   dbus_bool_t retval;
>   dbus_bool_t was_pending_activation;
>   DBusString command;
>+  DBusSpawnFlags flags = DBUS_SPAWN_NONE;
> 
>   _DBUS_ASSERT_ERROR_IS_CLEAR (error);
> 
>@@ -2087,10 +2088,14 @@ bus_activation_activate_service (BusActivation  *activation,
> 
>   dbus_error_init (&tmp_error);
> 
>+  if (bus_context_get_using_syslog (activation->context))
>+    flags |= DBUS_SPAWN_REDIRECT_OUTPUT;
>+
>   if (!_dbus_spawn_async_with_babysitter (&pending_activation->babysitter,
>                                           service_name,
>                                           argv,
>                                           envp,
>+                                          flags,
>                                           child_setup,
>                                           activation,
>                                           &tmp_error))
>diff --git a/bus/bus.c b/bus/bus.c
>index 90c2a3e..a239a20 100644
>--- a/bus/bus.c
>+++ b/bus/bus.c
>@@ -1370,6 +1370,12 @@ bus_context_get_initial_fd_limit (BusContext *context)
>   return context->initial_fd_limit;
> }
> 
>+dbus_bool_t
>+bus_context_get_using_syslog (BusContext *context)
>+{
>+  return context->syslog;
>+}
>+
> void
> bus_context_log (BusContext *context, DBusSystemLogSeverity severity, const char *msg, ...)
> {
>diff --git a/bus/bus.h b/bus/bus.h
>index b7869b2..ca42533 100644
>--- a/bus/bus.h
>+++ b/bus/bus.h
>@@ -121,6 +121,7 @@ int               bus_context_get_max_match_rules_per_connection (BusContext
> int               bus_context_get_max_replies_per_connection     (BusContext       *context);
> int               bus_context_get_reply_timeout                  (BusContext       *context);
> DBusRLimit *      bus_context_get_initial_fd_limit               (BusContext       *context);
>+dbus_bool_t       bus_context_get_using_syslog                   (BusContext       *context);
> void              bus_context_log                                (BusContext       *context,
>                                                                   DBusSystemLogSeverity severity,
>                                                                   const char       *msg,
>diff --git a/dbus/dbus-spawn-test.c b/dbus/dbus-spawn-test.c
>index 8c90fcc..01a2625 100644
>--- a/dbus/dbus-spawn-test.c
>+++ b/dbus/dbus-spawn-test.c
>@@ -64,7 +64,7 @@ check_spawn_nonexistent (void *data)
> 
>   argv[0] = "/this/does/not/exist/32542sdgafgafdg";
>   if (_dbus_spawn_async_with_babysitter (&sitter, "spawn_nonexistent", argv,
>-                                         NULL, NULL, NULL,
>+                                         NULL, DBUS_SPAWN_NONE, NULL, NULL,
>                                          &error))
>     {
>       _dbus_babysitter_block_for_child_exit (sitter);
>@@ -113,7 +113,7 @@ check_spawn_segfault (void *data)
>     }
> 
>   if (_dbus_spawn_async_with_babysitter (&sitter, "spawn_segfault", argv,
>-                                         NULL, NULL, NULL,
>+                                         NULL, DBUS_SPAWN_NONE, NULL, NULL,
>                                          &error))
>     {
>       _dbus_babysitter_block_for_child_exit (sitter);
>@@ -168,7 +168,7 @@ check_spawn_exit (void *data)
>     }
> 
>   if (_dbus_spawn_async_with_babysitter (&sitter, "spawn_exit", argv,
>-                                         NULL, NULL, NULL,
>+                                         NULL, DBUS_SPAWN_NONE, NULL, NULL,
>                                          &error))
>     {
>       _dbus_babysitter_block_for_child_exit (sitter);
>@@ -219,7 +219,7 @@ check_spawn_and_kill (void *data)
>     }
> 
>   if (_dbus_spawn_async_with_babysitter (&sitter, "spawn_and_kill", argv,
>-                                         NULL, NULL, NULL,
>+                                         NULL, DBUS_SPAWN_NONE, NULL, NULL,
>                                          &error))
>     {
>       _dbus_babysitter_kill_child (sitter);
>diff --git a/dbus/dbus-spawn-win.c b/dbus/dbus-spawn-win.c
>index 5cb3044..564f61d 100644
>--- a/dbus/dbus-spawn-win.c
>+++ b/dbus/dbus-spawn-win.c
>@@ -645,6 +645,7 @@ _dbus_spawn_async_with_babysitter (DBusBabysitter           **sitter_p,
>                                    const char                *log_name,
>                                    char                     **argv,
>                                    char                     **envp,
>+                                   DBusSpawnFlags             flags _DBUS_GNUC_UNUSED,
>                                    DBusSpawnChildSetupFunc    child_setup _DBUS_GNUC_UNUSED,
>                                    void                      *user_data _DBUS_GNUC_UNUSED,
>                                    DBusError                 *error)
>diff --git a/dbus/dbus-spawn.c b/dbus/dbus-spawn.c
>index e810ad5..70664cd 100644
>--- a/dbus/dbus-spawn.c
>+++ b/dbus/dbus-spawn.c
>@@ -1216,6 +1216,7 @@ _dbus_spawn_async_with_babysitter (DBusBabysitter          **sitter_p,
>                                    const char               *log_name,
>                                    char                    **argv,
>                                    char                    **env,
>+                                   DBusSpawnFlags            flags,
>                                    DBusSpawnChildSetupFunc   child_setup,
>                                    void                     *user_data,
>                                    DBusError                *error)
>@@ -1316,12 +1317,15 @@ _dbus_spawn_async_with_babysitter (DBusBabysitter          **sitter_p,
>   _DBUS_ASSERT_ERROR_IS_CLEAR (error);
> 
> #ifdef HAVE_SYSTEMD
>-  /* This may fail, but it's not critical.
>-   * In particular, if we were compiled with journald support but are now
>-   * running on a non-systemd system, this is going to fail, so we
>-   * have to cope gracefully. */
>-  fd_out = sd_journal_stream_fd (sitter->log_name, LOG_INFO, FALSE);
>-  fd_err = sd_journal_stream_fd (sitter->log_name, LOG_WARNING, FALSE);
>+  if (flags & DBUS_SPAWN_REDIRECT_OUTPUT)
>+    {
>+      /* This may fail, but it's not critical.
>+       * In particular, if we were compiled with journald support but are now
>+       * running on a non-systemd system, this is going to fail, so we
>+       * have to cope gracefully. */
>+      fd_out = sd_journal_stream_fd (sitter->log_name, LOG_INFO, FALSE);
>+      fd_err = sd_journal_stream_fd (sitter->log_name, LOG_WARNING, FALSE);
>+    }
> #endif
> 
>   pid = fork ();
>diff --git a/dbus/dbus-spawn.h b/dbus/dbus-spawn.h
>index 12ea586..dc04dc7 100644
>--- a/dbus/dbus-spawn.h
>+++ b/dbus/dbus-spawn.h
>@@ -38,10 +38,16 @@ typedef struct DBusBabysitter DBusBabysitter;
> typedef void (* DBusBabysitterFinishedFunc) (DBusBabysitter *sitter,
>                                              void           *user_data);
> 
>+typedef enum {
>+  DBUS_SPAWN_REDIRECT_OUTPUT = (1 << 0),
>+  DBUS_SPAWN_NONE = 0
>+} DBusSpawnFlags;
>+
> dbus_bool_t _dbus_spawn_async_with_babysitter     (DBusBabysitter           **sitter_p,
>                                                    const char                *log_name,
>                                                    char                     **argv,
>                                                    char                     **env,
>+                                                   DBusSpawnFlags             flags,
>                                                    DBusSpawnChildSetupFunc    child_setup,
>                                                    void                      *user_data,
>                                                    DBusError                 *error);
>diff --git a/test/spawn-test.c b/test/spawn-test.c
>index 12d37c8..a12c869 100644
>--- a/test/spawn-test.c
>+++ b/test/spawn-test.c
>@@ -30,7 +30,9 @@ main (int argc, char **argv)
>     argv_copy [i] = argv[i + 1];
>   argv_copy[argc - 1] = NULL;
>   
>-  if (!_dbus_spawn_async_with_babysitter (NULL, argv_copy[0], argv_copy, NULL, setup_func, NULL, &error))
>+  if (!_dbus_spawn_async_with_babysitter (NULL, argv_copy[0], argv_copy, NULL,
>+                                          DBUS_SPAWN_NONE, setup_func, NULL,
>+                                          &error))
>     {
>       fprintf (stderr, "Could not launch application: \"%s\"\n",
> 	       error.message);
>-- 
>2.8.1

Actions: View | Splinter Review

Attachments on bug 97009: 125171 | 125172 | 125173 | 125174 | 125175 | 125176 | 125177 | 125178 | 125179 | 125180 | 125190 | 125191 | 125192 | 125193 | 125194 | 125195 | 125196 | 125197 | 125198 | 125199 | 125200 | 125201 | 125202 | 125203 | 125204 | 125205 | 125741 | 125742 | 125743 | 125744 | 125745 | 125746 | 125747 | 125748 | 125749 | 125750 | 125751

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.