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

log: a bit clearer calls to dup()

Browse Source
This commit is contained in:
Robert Swiecki 2019-08-22 13:59:15 +02:00
parent c291b11ae6
commit b435292e9a
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
logs.cc
View File

@ -45,12 +45,17 @@ static bool _log_fd_isatty = true;
static enum llevel_t _log_level = INFO; static enum llevel_t _log_level = INFO;
static bool _log_set = false; static bool _log_set = false;
int getDupLogFd(int fd) { static void setDupLogFdOr(int fd, int orfd) {
fd = fcntl(fd, F_DUPFD_CLOEXEC, 0); int saved_errno = errno;
if (fd >= 0) { _log_fd = fcntl(fd, F_DUPFD_CLOEXEC, 0);
return fd; if (_log_fd == -1) {
_log_fd = fcntl(orfd, F_DUPFD_CLOEXEC, 0);
} }
return STDERR_FILENO; if (_log_fd == -1) {
_log_fd = orfd;
}
_log_fd_isatty = (isatty(_log_fd) == 1);
errno = saved_errno;
} }
/* /*
@ -58,8 +63,7 @@ int getDupLogFd(int fd) {
* connection socket with fd (0, 1, 2). * connection socket with fd (0, 1, 2).
*/ */
__attribute__((constructor)) static void log_init(void) { __attribute__((constructor)) static void log_init(void) {
_log_fd = getDupLogFd(STDERR_FILENO); setDupLogFdOr(STDERR_FILENO, STDERR_FILENO);
_log_fd_isatty = isatty(_log_fd);
} }
bool logSet() { bool logSet() {
@ -76,14 +80,14 @@ void logFile(const std::string& logfile) {
if (_log_fd > STDERR_FILENO) { if (_log_fd > STDERR_FILENO) {
close(_log_fd); close(_log_fd);
} }
if (TEMP_FAILURE_RETRY(_log_fd = open(logfile.c_str(), int newlogfd = TEMP_FAILURE_RETRY(
O_CREAT | O_RDWR | O_APPEND | O_CLOEXEC, 0640)) == -1) { open(logfile.c_str(), O_CREAT | O_RDWR | O_APPEND | O_CLOEXEC, 0640));
int saved_errno = errno; setDupLogFdOr(newlogfd, STDERR_FILENO);
_log_fd = getDupLogFd(STDERR_FILENO); if (newlogfd == -1) {
LOG_W( PLOG_W("Couldn't open logfile open('%s')", logfile.c_str());
"Couldn't open logfile open('%s'): %s", logfile.c_str(), strerror(saved_errno)); } else {
close(newlogfd);
} }
_log_fd_isatty = (isatty(_log_fd) == 1);
} }
void logMsg(enum llevel_t ll, const char* fn, int ln, bool perr, const char* fmt, ...) { void logMsg(enum llevel_t ll, const char* fn, int ln, bool perr, const char* fmt, ...) {