From 0985816bf6eef4fd7c6a1b4baa9da3c1510f7de5 Mon Sep 17 00:00:00 2001
From: Philip Kaufmann <phil.kaufmann@t-online.de>
Date: Sat, 12 May 2012 00:09:33 +0200
Subject: [PATCH] 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)

---
 src/main.cpp     | 6 +-----
 src/net.cpp      | 2 --
 src/net.h        | 4 +---
 src/util.cpp     | 2 +-
 src/walletdb.cpp | 1 -
 5 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 20bb56e9..29c407f4 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2267,10 +2267,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
 {
     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 @@ bool CheckWork(CBlock* pblock, CWallet& wallet, CReserveKey& reservekey)
     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 @@ void static BitcoinMiner(CWallet *pwallet)
                         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);
                         }
                     }
diff --git a/src/net.cpp b/src/net.cpp
index 82a215c6..234a5c5c 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -516,8 +516,6 @@ void CNode::CloseSocketDisconnect()
     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;
diff --git a/src/net.h b/src/net.h
index 3755c765..d776860f 100644
--- a/src/net.h
+++ b/src/net.h
@@ -318,10 +318,8 @@ public:
         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()
diff --git a/src/util.cpp b/src/util.cpp
index 170ea051..823d00a4 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -147,7 +147,7 @@ void RandAddSeedPerfmon()
     {
         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
 }
diff --git a/src/walletdb.cpp b/src/walletdb.cpp
index e5d57288..7849828a 100644
--- a/src/walletdb.cpp
+++ b/src/walletdb.cpp
@@ -367,7 +367,6 @@ void ThreadFlushWalletDB(void* parg)
                     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();