Merge pull request #6742
58981d4
Changed logging to make -logtimestamps to work also for -printtoconsole (Arne Brutschy)
This commit is contained in:
commit
3b2d37c619
1 changed files with 4 additions and 3 deletions
|
@ -280,10 +280,13 @@ int LogPrintStr(const std::string &str)
|
|||
{
|
||||
int ret = 0; // Returns total number of characters written
|
||||
static bool fStartedNewLine = true;
|
||||
|
||||
string strTimestamped = LogTimestampStr(str, &fStartedNewLine);
|
||||
|
||||
if (fPrintToConsole)
|
||||
{
|
||||
// print to console
|
||||
ret = fwrite(str.data(), 1, str.size(), stdout);
|
||||
ret = fwrite(strTimestamped.data(), 1, strTimestamped.size(), stdout);
|
||||
fflush(stdout);
|
||||
}
|
||||
else if (fPrintToDebugLog)
|
||||
|
@ -291,8 +294,6 @@ int LogPrintStr(const std::string &str)
|
|||
boost::call_once(&DebugPrintInit, debugPrintInitFlag);
|
||||
boost::mutex::scoped_lock scoped_lock(*mutexDebugLog);
|
||||
|
||||
string strTimestamped = LogTimestampStr(str, &fStartedNewLine);
|
||||
|
||||
// buffer if we haven't opened the log yet
|
||||
if (fileout == NULL) {
|
||||
assert(vMsgsBeforeOpenLog);
|
||||
|
|
Loading…
Reference in a new issue