aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Towns <aj@erisian.com.au>2018-05-03 10:14:01 +1000
committerMarcoFalke <falke.marco@gmail.com>2019-05-28 14:26:06 -0400
commit412987430c98e78ccda033ab1cf7a176a4c0b835 (patch)
tree5803f80fad55ff4262cd17a15c288980456a6fa6
parent8ab4f282c06d67074b872dbda0be37636fdd5186 (diff)
Replace OpenDebugLog() with StartLogging()
StartLogging() is used to mark the start of logging generically, whether using -printtoconsole or -debuglogfile.
-rw-r--r--src/init.cpp4
-rw-r--r--src/logging.cpp3
-rw-r--r--src/logging.h2
3 files changed, 5 insertions, 4 deletions
diff --git a/src/init.cpp b/src/init.cpp
index 2bb270647a..fdfde689f9 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1249,10 +1249,10 @@ bool AppInitMain(InitInterfaces& interfaces)
// and because this needs to happen before any other debug.log printing
LogInstance().ShrinkDebugFile();
}
- if (!LogInstance().OpenDebugLog()) {
+ }
+ if (!LogInstance().StartLogging()) {
return InitError(strprintf("Could not open debug log file %s",
LogInstance().m_file_path.string()));
- }
}
if (!LogInstance().m_log_timestamps)
diff --git a/src/logging.cpp b/src/logging.cpp
index 3eda4995db..f9d9d9c56b 100644
--- a/src/logging.cpp
+++ b/src/logging.cpp
@@ -39,9 +39,10 @@ static int FileWriteStr(const std::string &str, FILE *fp)
return fwrite(str.data(), 1, str.size(), fp);
}
-bool BCLog::Logger::OpenDebugLog()
+bool BCLog::Logger::StartLogging()
{
std::lock_guard<std::mutex> scoped_lock(m_file_mutex);
+ if (!m_print_to_file) return true;
assert(m_fileout == nullptr);
assert(!m_file_path.empty());
diff --git a/src/logging.h b/src/logging.h
index e399d4c307..4fa9e0c8a4 100644
--- a/src/logging.h
+++ b/src/logging.h
@@ -93,7 +93,7 @@ namespace BCLog {
/** Returns whether logs will be written to any output */
bool Enabled() const { return m_print_to_console || m_print_to_file; }
- bool OpenDebugLog();
+ bool StartLogging();
void ShrinkDebugFile();
uint32_t GetCategoryMask() const { return m_categories.load(); }