Mercurial > hg > bitcoin
changeset 2539:ad15aef6346a draft
ensure that no double timestamps show up in the debug.log, by removing manual timestamps from the source (now only -logtimestamps parameter adds timestamps to debug.log)
author | Philip Kaufmann <phil.kaufmann@t-online.de> |
---|---|
date | Sat, 12 May 2012 00:09:33 +0200 |
parents | 6bb9b0ad1725 |
children | a677b6fbe6c1 |
files | src/main.cpp src/net.cpp src/net.h src/util.cpp src/walletdb.cpp |
diffstat | 5 files changed, 3 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/src/main.cpp +++ b/src/main.cpp @@ -2267,10 +2267,8 @@ { static map<CService, vector<unsigned char> > mapReuseKey; RandAddSeedPerfmon(); - if (fDebug) { - printf("%s ", DateTimeStrFormat("%x %H:%M:%S", GetTime()).c_str()); + if (fDebug) printf("received: %s (%d bytes)\n", strCommand.c_str(), vRecv.size()); - } if (mapArgs.count("-dropmessagestest") && GetRand(atoi(mapArgs["-dropmessagestest"])) == 0) { printf("dropmessagestest DROPPING RECV MESSAGE\n"); @@ -3473,7 +3471,6 @@ printf("BitcoinMiner:\n"); printf("proof-of-work found \n hash: %s \ntarget: %s\n", hash.GetHex().c_str(), hashTarget.GetHex().c_str()); pblock->print(); - printf("%s ", DateTimeStrFormat("%x %H:%M", GetTime()).c_str()); printf("generated %s\n", FormatMoney(pblock->vtx[0].vout[0].nValue).c_str()); // Found a solution @@ -3614,7 +3611,6 @@ if (GetTime() - nLogTime > 30 * 60) { nLogTime = GetTime(); - printf("%s ", DateTimeStrFormat("%x %H:%M", GetTime()).c_str()); printf("hashmeter %3d CPUs %6.0f khash/s\n", vnThreadsRunning[THREAD_MINER], dHashesPerSec/1000.0); } }
--- a/src/net.cpp +++ b/src/net.cpp @@ -516,8 +516,6 @@ fDisconnect = true; if (hSocket != INVALID_SOCKET) { - if (fDebug) - printf("%s ", DateTimeStrFormat("%x %H:%M:%S", GetTime()).c_str()); printf("disconnecting node %s\n", addrName.c_str()); closesocket(hSocket); hSocket = INVALID_SOCKET;
--- a/src/net.h +++ b/src/net.h @@ -318,10 +318,8 @@ nHeaderStart = vSend.size(); vSend << CMessageHeader(pszCommand, 0); nMessageStart = vSend.size(); - if (fDebug) { - printf("%s ", DateTimeStrFormat("%x %H:%M:%S", GetTime()).c_str()); + if (fDebug) printf("sending: %s ", pszCommand); - } } void AbortMessage()
--- a/src/util.cpp +++ b/src/util.cpp @@ -147,7 +147,7 @@ { RAND_add(pdata, nSize, nSize/100.0); memset(pdata, 0, nSize); - printf("%s RandAddSeed() %d bytes\n", DateTimeStrFormat("%x %H:%M", GetTime()).c_str(), nSize); + printf("RandAddSeed() %d bytes\n", nSize); } #endif }
--- a/src/walletdb.cpp +++ b/src/walletdb.cpp @@ -367,7 +367,6 @@ map<string, int>::iterator mi = mapFileUseCount.find(strFile); if (mi != mapFileUseCount.end()) { - printf("%s ", DateTimeStrFormat("%x %H:%M:%S", GetTime()).c_str()); printf("Flushing wallet.dat\n"); nLastFlushed = nWalletDBUpdated; int64 nStart = GetTimeMillis();