mirror of
https://github.com/systemd/systemd-stable.git
synced 2025-01-10 01:17:44 +03:00
core: Settle log target if we're going to be closing all fds
Whenever we're going to close all file descriptors, we tend to close the log and set it into open when needed mode. When this is done with the logging target set to LOG_TARGET_AUTO, we run into issues because for every logging call, we'll check if stderr is connected to the journal to determine where to send the logging message. This check obviously stops working when we close stderr, so we settle the log target before we do that so that we keep using the same logging target even after stderr is closed.
This commit is contained in:
parent
8d0747abb7
commit
a3b00f91bb
@ -81,6 +81,7 @@ static int open_sockets(int *ret_epoll_fd, bool accept) {
|
||||
|
||||
log_close();
|
||||
log_set_open_when_needed(true);
|
||||
log_settle_target();
|
||||
|
||||
r = close_all_fds(except, n);
|
||||
if (r < 0)
|
||||
|
@ -1264,6 +1264,24 @@ LogTarget log_get_target(void) {
|
||||
return log_target;
|
||||
}
|
||||
|
||||
void log_settle_target(void) {
|
||||
|
||||
/* If we're using LOG_TARGET_AUTO and opening the log again on every single log call, we'll check if
|
||||
* stderr is attached to the journal every single log call. However, if we then close all file
|
||||
* descriptors later, that will stop working because stderr will be closed as well. To avoid that
|
||||
* problem, this function is used to permanently change the log target depending on whether stderr is
|
||||
* connected to the journal or not. */
|
||||
|
||||
LogTarget t = log_get_target();
|
||||
|
||||
if (t != LOG_TARGET_AUTO)
|
||||
return;
|
||||
|
||||
t = getpid_cached() == 1 || stderr_is_journal() ? (prohibit_ipc ? LOG_TARGET_KMSG : LOG_TARGET_JOURNAL_OR_KMSG)
|
||||
: LOG_TARGET_CONSOLE;
|
||||
log_set_target(t);
|
||||
}
|
||||
|
||||
int log_get_max_level(void) {
|
||||
return log_max_level;
|
||||
}
|
||||
|
@ -54,6 +54,7 @@ void log_set_target(LogTarget target);
|
||||
void log_set_target_and_open(LogTarget target);
|
||||
int log_set_target_from_string(const char *e);
|
||||
LogTarget log_get_target(void) _pure_;
|
||||
void log_settle_target(void);
|
||||
|
||||
void log_set_max_level(int level);
|
||||
int log_set_max_level_from_string(const char *e);
|
||||
|
@ -1223,6 +1223,7 @@ int safe_fork_full(
|
||||
/* Close the logs if requested, before we log anything. And make sure we reopen it if needed. */
|
||||
log_close();
|
||||
log_set_open_when_needed(true);
|
||||
log_settle_target();
|
||||
}
|
||||
|
||||
if (name) {
|
||||
|
@ -4488,6 +4488,7 @@ static int exec_child(
|
||||
|
||||
log_forget_fds();
|
||||
log_set_open_when_needed(true);
|
||||
log_settle_target();
|
||||
|
||||
/* In case anything used libc syslog(), close this here, too */
|
||||
closelog();
|
||||
|
@ -3551,6 +3551,7 @@ static int inner_child(
|
||||
* it again. Note that the other fds closed here are at least the locking and barrier fds. */
|
||||
log_close();
|
||||
log_set_open_when_needed(true);
|
||||
log_settle_target();
|
||||
|
||||
(void) fdset_close_others(fds);
|
||||
|
||||
|
@ -278,6 +278,7 @@ static void test_close_all_fds_inner(void) {
|
||||
/* Close logging fd first, so that we don't confuse it by closing its fd */
|
||||
log_close();
|
||||
log_set_open_when_needed(true);
|
||||
log_settle_target();
|
||||
|
||||
/* Close all but the ones to keep */
|
||||
assert_se(close_all_fds(keep, n_keep) >= 0);
|
||||
|
Loading…
Reference in New Issue
Block a user