journal: suppress structured messages if they'd go to the console

2 files changed, 9 insertions, 0 deletions

diff --git a/src/shared/log.c b/src/shared/log.c
index 67a3e1b843..847202d7d3 100644
--- a/src/shared/log.c
+++ b/src/shared/log.c
@@ -859,6 +859,13 @@ int log_show_location_from_string(const char *e) {
         return 0;
 }
 
+bool log_on_console(void) {
+        if (log_target == LOG_TARGET_CONSOLE)
+                return true;
+
+        return syslog_fd < 0 && kmsg_fd < 0 && journal_fd < 0;
+}
+
 static const char *const log_target_table[] = {
         [LOG_TARGET_CONSOLE] = "console",
         [LOG_TARGET_KMSG] = "kmsg",
diff --git a/src/shared/log.h b/src/shared/log.h
index 0c60b7671b..c242cc219f 100644
--- a/src/shared/log.h
+++ b/src/shared/log.h
@@ -131,5 +131,7 @@ _noreturn_ void log_assert_failed_unreachable(
 /* This modifies the buffer passed! */
 #define log_dump(level, buffer) log_dump_internal(level, __FILE__, __LINE__, __func__, buffer)
 
+bool log_on_console(void);
+
 const char *log_target_to_string(LogTarget target);
 LogTarget log_target_from_string(const char *s);