From cceedbc4bf1056db17e0adf76d0db45b94777671 Mon Sep 17 00:00:00 2001 From: practicalswift Date: Thu, 3 May 2018 18:04:58 +0200 Subject: [PATCH 1/2] Don't close old debug log file handle prematurely when trying to re-open (on SIGHUP) --- src/logging.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/logging.cpp b/src/logging.cpp index 6557dddffb..0ae4f8121e 100644 --- a/src/logging.cpp +++ b/src/logging.cpp @@ -219,13 +219,13 @@ void BCLog::Logger::LogPrintStr(const std::string &str) // reopen the log file, if requested if (m_reopen_file) { m_reopen_file = false; - m_fileout = fsbridge::freopen(m_file_path, "a", m_fileout); - if (!m_fileout) { - return; + FILE* new_fileout = fsbridge::fopen(m_file_path, "a"); + if (new_fileout) { + setbuf(new_fileout, nullptr); // unbuffered + fclose(m_fileout); + m_fileout = new_fileout; } - setbuf(m_fileout, nullptr); // unbuffered } - FileWriteStr(strTimestamped, m_fileout); } } From 75ea00f391b742e435c650aae3e827aad913d552 Mon Sep 17 00:00:00 2001 From: practicalswift Date: Thu, 3 May 2018 18:05:42 +0200 Subject: [PATCH 2/2] Remove unused fsbridge::freopen --- src/fs.cpp | 5 ----- src/fs.h | 1 - 2 files changed, 6 deletions(-) diff --git a/src/fs.cpp b/src/fs.cpp index e7d06e45ab..2dbc13643b 100644 --- a/src/fs.cpp +++ b/src/fs.cpp @@ -14,11 +14,6 @@ FILE *fopen(const fs::path& p, const char *mode) return ::fopen(p.string().c_str(), mode); } -FILE *freopen(const fs::path& p, const char *mode, FILE *stream) -{ - return ::freopen(p.string().c_str(), mode, stream); -} - #ifndef WIN32 static std::string GetErrorReason() { diff --git a/src/fs.h b/src/fs.h index e3ff51604d..5a28d9a81c 100644 --- a/src/fs.h +++ b/src/fs.h @@ -18,7 +18,6 @@ namespace fs = boost::filesystem; /** Bridge operations to C stdio */ namespace fsbridge { FILE *fopen(const fs::path& p, const char *mode); - FILE *freopen(const fs::path& p, const char *mode, FILE *stream); class FileLock {