From: Franck Bui <fbui@suse.com>
Date: Mon, 3 Aug 2020 15:50:11 +0000 (+0200)
Subject: log: don't explicitly re-open log for failed assertions
X-Git-Tag: v247-rc1~417
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=21fd6bc263f49b57867d90d2e1f9f255e5509134;p=thirdparty%2Fsystemd.git

log: don't explicitly re-open log for failed assertions

This was needed before commit 16e4fd87c5be06d2b7a3b368205c8c5bab9df32a added a
mode that opens the log fds for every single log message. This mode is used in
execute.c since then making the explicit call to log_open unnecessary.

This basically reverts ea89a119cda917a17bd186b3c13197acfd655b12.
---

diff --git a/src/basic/log.c b/src/basic/log.c
index c6fe2038083..899a8423f22 100644
--- a/src/basic/log.c
+++ b/src/basic/log.c
@@ -838,7 +838,6 @@ _noreturn_ void log_assert_failed_realm(
                 const char *file,
                 int line,
                 const char *func) {
-        (void) log_open();
         log_assert(LOG_REALM_PLUS_LEVEL(realm, LOG_CRIT), text, file, line, func,
                    "Assertion '%s' failed at %s:%u, function %s(). Aborting.");
         abort();
@@ -850,7 +849,6 @@ _noreturn_ void log_assert_failed_unreachable_realm(
                 const char *file,
                 int line,
                 const char *func) {
-        (void) log_open();
         log_assert(LOG_REALM_PLUS_LEVEL(realm, LOG_CRIT), text, file, line, func,
                    "Code should not be reached '%s' at %s:%u, function %s(). Aborting.");
         abort();