From ba163bc89fcd8f600e62337aefa5cc540cff6879 Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Mon, 4 Jun 2012 07:17:41 -0700 Subject: [PATCH] Logging modernization. --- src/Transaction.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/Transaction.cpp b/src/Transaction.cpp index 4a60814ffb..947533ce21 100644 --- a/src/Transaction.cpp +++ b/src/Transaction.cpp @@ -11,6 +11,7 @@ #include "BitcoinUtil.h" #include "Serializer.h" #include "SerializedTransaction.h" +#include "Log.h" Transaction::Transaction(const SerializedTransaction::pointer sit, bool bValidate) : mInLedger(0), mStatus(INVALID), mTransaction(sit) @@ -43,6 +44,7 @@ Transaction::pointer Transaction::sharedTransaction(const std::vector(); } } @@ -66,8 +68,8 @@ Transaction::Transaction( mTransaction = boost::make_shared(ttKind); - std::cerr << str(boost::format("Transaction: account: %s") % naSourceAccount.humanAccountID()) << std::endl; - std::cerr << str(boost::format("Transaction: mAccountFrom: %s") % mAccountFrom.humanAccountID()) << std::endl; + Log(lsINFO) << str(boost::format("Transaction: account: %s") % naSourceAccount.humanAccountID()); + Log(lsINFO) << str(boost::format("Transaction: mAccountFrom: %s") % mAccountFrom.humanAccountID()); mTransaction->setSigningPubKey(mFromPubKey); mTransaction->setSourceAccount(mAccountFrom); mTransaction->setSequence(uSeq); @@ -86,16 +88,12 @@ bool Transaction::sign(const NewcoinAddress& naAccountPrivate) if (!naAccountPrivate.isValid()) { -#ifdef DEBUG - std::cerr << "No private key for signing" << std::endl; -#endif + Log(lsWARNING) << "No private key for signing"; bResult = false; } else if (!getSTransaction()->sign(naAccountPrivate)) { -#ifdef DEBUG - std::cerr << "Failed to make signature" << std::endl; -#endif + Log(lsWARNING) << "Failed to make signature"; assert(false); bResult = false; }