diff --git a/man/systemd.xml b/man/systemd.xml
index 3e3e8678bc..65c7fc2bb1 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -772,20 +772,21 @@
SIGRTMIN+26
+
+ Restores the log target to its configured value. The configured value is derived from – in
+ order of priority – the value specified with systemd.log-target= on the kernel command line,
+ or the value specified with in the configuration file, or the built-in
+ default.
+
+
+
SIGRTMIN+27
SIGRTMIN+28
- Sets the log target to
- journal-or-kmsg (or
- console on
- SIGRTMIN+27, kmsg on
- SIGRTMIN+28), as controlled via
- systemd.log_target=journal-or-kmsg (or
- systemd.log_target=console on
- SIGRTMIN+27 or
- systemd.log_target=kmsg on
- SIGRTMIN+28) on the kernel command
- line.
+ Sets the log target to console on SIGRTMIN+27 (or
+ kmsg on SIGRTMIN+28), in a fashion equivalent to
+ systemd.log_target=console (or systemd.log_target=kmsg on
+ SIGRTMIN+28) on the kernel command line.
diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
index d97fe4087c..016741e40b 100644
--- a/src/core/dbus-manager.c
+++ b/src/core/dbus-manager.c
@@ -114,6 +114,7 @@ static int property_set_log_target(
void *userdata,
sd_bus_error *error) {
+ Manager *m = userdata;
const char *t;
int r;
@@ -124,7 +125,19 @@ static int property_set_log_target(
if (r < 0)
return r;
- return log_set_target_from_string(t);
+ if (isempty(t))
+ manager_restore_original_log_target(m);
+ else {
+ LogTarget target;
+
+ target = log_target_from_string(t);
+ if (target < 0)
+ return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid log target '%s'", t);
+
+ manager_override_log_target(m, target);
+ }
+
+ return 0;
}
static int property_get_log_level(
diff --git a/src/core/main.c b/src/core/main.c
index d044427d74..ad1ae591e1 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1641,11 +1641,16 @@ static int invoke_main_loop(
switch (m->exit_code) {
case MANAGER_RELOAD: {
+ LogTarget saved_log_target;
int saved_log_level;
log_info("Reloading.");
+ /* First, save any overriden log level/target, then parse the configuration file, which might
+ * change the log level to new settings. */
+
saved_log_level = m->log_level_overridden ? log_get_max_level() : -1;
+ saved_log_target = m->log_target_overridden ? log_get_target() : _LOG_TARGET_INVALID;
r = parse_config_file();
if (r < 0)
@@ -1655,6 +1660,8 @@ static int invoke_main_loop(
if (saved_log_level >= 0)
manager_override_log_level(m, saved_log_level);
+ if (saved_log_target >= 0)
+ manager_override_log_target(m, saved_log_target);
r = manager_reload(m);
if (r < 0)
diff --git a/src/core/manager.c b/src/core/manager.c
index 92d5a0fff6..a6b2edcb83 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -737,6 +737,7 @@ int manager_new(UnitFileScope scope, unsigned test_run_flags, Manager **_m) {
m->default_timeout_stop_usec = DEFAULT_TIMEOUT_USEC;
m->default_restart_usec = DEFAULT_RESTART_USEC;
m->original_log_level = -1;
+ m->original_log_target = _LOG_TARGET_INVALID;
#if ENABLE_EFI
if (MANAGER_IS_SYSTEM(m) && detect_container() <= 0)
@@ -2646,18 +2647,15 @@ static int manager_dispatch_signal_fd(sd_event_source *source, int fd, uint32_t
case 26:
case 29: /* compatibility: used to be mapped to LOG_TARGET_SYSLOG_OR_KMSG */
- log_set_target(LOG_TARGET_JOURNAL_OR_KMSG);
- log_notice("Setting log target to journal-or-kmsg.");
+ manager_restore_original_log_target(m);
break;
case 27:
- log_set_target(LOG_TARGET_CONSOLE);
- log_notice("Setting log target to console.");
+ manager_override_log_target(m, LOG_TARGET_CONSOLE);
break;
case 28:
- log_set_target(LOG_TARGET_KMSG);
- log_notice("Setting log target to kmsg.");
+ manager_override_log_target(m, LOG_TARGET_KMSG);
break;
default:
@@ -3029,6 +3027,8 @@ int manager_serialize(Manager *m, FILE *f, FDSet *fds, bool switching_root) {
if (m->log_level_overridden)
fprintf(f, "log-level-override=%i\n", log_get_max_level());
+ if (m->log_target_overridden)
+ fprintf(f, "log-target-override=%s\n", log_target_to_string(log_get_target()));
for (q = 0; q < _MANAGER_TIMESTAMP_MAX; q++) {
/* The userspace and finish timestamps only apply to the host system, hence only serialize them there */
@@ -3222,6 +3222,15 @@ int manager_deserialize(Manager *m, FILE *f, FDSet *fds) {
else
manager_override_log_level(m, level);
+ } else if ((val = startswith(l, "log-target-override="))) {
+ LogTarget target;
+
+ target = log_target_from_string(val);
+ if (target < 0)
+ log_notice("Failed to parse log-target-override value '%s', ignoring.", val);
+ else
+ manager_override_log_target(m, target);
+
} else if (startswith(l, "env=")) {
r = deserialize_environment(&m->environment, l);
if (r == -ENOMEM)
@@ -4489,6 +4498,30 @@ void manager_restore_original_log_level(Manager *m) {
m->log_level_overridden = false;
}
+void manager_override_log_target(Manager *m, LogTarget target) {
+ assert(m);
+
+ if (!m->log_target_overridden) {
+ m->original_log_target = log_get_target();
+ m->log_target_overridden = true;
+ }
+
+ log_info("Setting log target to %s.", log_target_to_string(target));
+ log_set_target(target);
+}
+
+void manager_restore_original_log_target(Manager *m) {
+ assert(m);
+
+ if (!m->log_target_overridden)
+ return;
+
+ log_info("Restoring log target to original %s.", log_target_to_string(m->original_log_target));
+
+ log_set_target(m->original_log_target);
+ m->log_target_overridden = false;
+}
+
static const char *const manager_state_table[_MANAGER_STATE_MAX] = {
[MANAGER_INITIALIZING] = "initializing",
[MANAGER_STARTING] = "starting",
diff --git a/src/core/manager.h b/src/core/manager.h
index fb28316b8e..4555a4ff15 100644
--- a/src/core/manager.h
+++ b/src/core/manager.h
@@ -303,7 +303,9 @@ struct Manager {
usec_t default_timer_accuracy_usec;
int original_log_level;
+ LogTarget original_log_target;
bool log_level_overridden:1;
+ bool log_target_overridden:1;
struct rlimit *rlimit[_RLIMIT_MAX];
@@ -471,6 +473,9 @@ void manager_unref_console(Manager *m);
void manager_override_log_level(Manager *m, int level);
void manager_restore_original_log_level(Manager *m);
+void manager_override_log_target(Manager *m, LogTarget target);
+void manager_restore_original_log_target(Manager *m);
+
const char *manager_state_to_string(ManagerState m) _const_;
ManagerState manager_state_from_string(const char *s) _pure_;