From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 7 Feb 2018 14:08:18 +0000 (+0100)
Subject: core: simplify manager_recheck_journal() a bit
X-Git-Tag: v238~101^2~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cedf50888660476ebc5a239fbcfac665574bc0b3;p=thirdparty%2Fsystemd.git

core: simplify manager_recheck_journal() a bit

No need for an if check if we just pass along a bool anyway.
---

diff --git a/src/core/manager.c b/src/core/manager.c
index 9c68eb49d19..e83a0dd5e6e 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -3601,16 +3601,10 @@ void manager_recheck_journal(Manager *m) {
         if (getpid_cached() != 1)
                 return;
 
-        if (manager_journal_is_running(m)) {
-
-                /* The journal is fully and entirely up? If so, let's permit logging to it, if that's configured. */
-                log_set_prohibit_ipc(false);
-        } else {
-
-                /* If the journal is down, don't ever log to it, otherwise we might end up deadlocking ourselves as we
-                 * might trigger an activation ourselves we can't fulfill */
-                log_set_prohibit_ipc(true);
-        }
+        /* The journal is fully and entirely up? If so, let's permit logging to it, if that's configured. If the
+         * journal is down, don't ever log to it, otherwise we might end up deadlocking ourselves as we might trigger
+         * an activation ourselves we can't fulfill. */
+        log_set_prohibit_ipc(!manager_journal_is_running(m));
         log_open();
 }