woj/nsjail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Log to a duplicate of stderr initially

Browse Source
This commit is contained in:
Robert Swiecki 2018-06-07 18:42:34 +02:00
parent e8e6c1b906
commit 0f2d50bf1a
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
logs.cc
View File

@ -49,6 +49,10 @@ static bool _log_set = false;
__attribute__((constructor)) static void log_init(void) {
_log_fd_isatty = isatty(_log_fd);
_log_fd = fcntl(_log_fd, F_DUPFD_CLOEXEC, 0);
if (_log_fd == -1) {
_log_fd = STDERR_FILENO;
}
}
bool logSet() {
@ -71,18 +75,11 @@ void logFile(const std::string& logfile) {
close(_log_fd);
_log_fd = STDERR_FILENO;
}
if (logfile.empty()) {
_log_fd = fcntl(_log_fd, F_DUPFD_CLOEXEC, 0);
if (_log_fd == -1) {
_log_fd = STDERR_FILENO;
}
} else {
if (TEMP_FAILURE_RETRY(_log_fd = open(logfile.c_str(),
O_CREAT | O_RDWR | O_APPEND | O_CLOEXEC, 0640)) == -1) {
_log_fd = STDERR_FILENO;
PLOG_W("Couldn't open logfile open('%s')", logfile.c_str());
}
}
_log_fd_isatty = (isatty(_log_fd) == 1);
}