LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Merge pull request #6742

Browse source 
58981d4 Changed logging to make -logtimestamps to work also for -printtoconsole (Arne Brutschy)
This commit is contained in:
Wladimir J. van der Laan 2015-10-05 13:43:53 +02:00
commit 3b2d37c619
No known key found for this signature in database
GPG key ID: 74810B012346C9A6
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/util.cpp
View file

@ -280,10 +280,13 @@ int LogPrintStr(const std::string &str)
{ {
int ret = 0; // Returns total number of characters written int ret = 0; // Returns total number of characters written
static bool fStartedNewLine = true; static bool fStartedNewLine = true;
string strTimestamped = LogTimestampStr(str, &fStartedNewLine);
if (fPrintToConsole) if (fPrintToConsole)
{ {
// print to console // print to console
ret = fwrite(str.data(), 1, str.size(), stdout); ret = fwrite(strTimestamped.data(), 1, strTimestamped.size(), stdout);
fflush(stdout); fflush(stdout);
} }
else if (fPrintToDebugLog) else if (fPrintToDebugLog)
@ -291,8 +294,6 @@ int LogPrintStr(const std::string &str)
boost::call_once(&DebugPrintInit, debugPrintInitFlag); boost::call_once(&DebugPrintInit, debugPrintInitFlag);
boost::mutex::scoped_lock scoped_lock(*mutexDebugLog); boost::mutex::scoped_lock scoped_lock(*mutexDebugLog);
string strTimestamped = LogTimestampStr(str, &fStartedNewLine);
// buffer if we haven't opened the log yet // buffer if we haven't opened the log yet
if (fileout == NULL) { if (fileout == NULL) {
assert(vMsgsBeforeOpenLog); assert(vMsgsBeforeOpenLog);