diff --git a/src/Peer.cpp b/src/Peer.cpp index 9cbaa4f93a..df3ea8fa78 100644 --- a/src/Peer.cpp +++ b/src/Peer.cpp @@ -60,7 +60,7 @@ void Peer::handle_write(const boost::system::error_code& error, size_t bytes_tra void Peer::detach(const char *rsn) { #ifdef DEBUG - std::cerr << "DETACHING PEER: " << rsn << std::endl; + Log(lsTRACE) << "DETACHING PEER: " << rsn; #endif boost::system::error_code ecCancel; diff --git a/src/TransactionEngine.cpp b/src/TransactionEngine.cpp index 14902bf23f..2235ff1bd4 100644 --- a/src/TransactionEngine.cpp +++ b/src/TransactionEngine.cpp @@ -40,12 +40,12 @@ TransactionEngineResult TransactionEngine::dirAdd( sleRoot->setIndex(uRootIndex); - std::cerr << "dirAdd: Creating dir index: " << sleRoot->getIndex().ToString() << std::endl; + Log(lsTRACE) << "dirAdd: Creating dir index: " << sleRoot->getIndex().ToString(); sleRoot->setIFieldU64(sfFirstNode, uNodeDir); sleRoot->setIFieldU64(sfLastNode, uNodeDir); - std::cerr << "dirAdd: first & last: " << strHex(uNodeDir) << std::endl; + Log(lsTRACE) << "dirAdd: first & last: " << strHex(uNodeDir); accounts.push_back(std::make_pair(taaCREATE, sleRoot)); } @@ -64,9 +64,9 @@ TransactionEngineResult TransactionEngine::dirAdd( { // Last node is not full, append. - std::cerr << "dirAdd: appending: PREV: " << svIndexes.peekValue()[0].ToString() << std::endl; - std::cerr << "dirAdd: appending: Node: " << strHex(uNodeDir) << std::endl; - std::cerr << "dirAdd: appending: Entry: " << uLedgerIndex.ToString() << std::endl; + Log(lsTRACE) << "dirAdd: appending: PREV: " << svIndexes.peekValue()[0].ToString(); + Log(lsTRACE) << "dirAdd: appending: Node: " << strHex(uNodeDir); + Log(lsTRACE) << "dirAdd: appending: Entry: " << uLedgerIndex.ToString(); svIndexes.peekValue().push_back(uLedgerIndex); sleNode->setIFieldV256(sfIndexes, svIndexes); @@ -83,7 +83,7 @@ TransactionEngineResult TransactionEngine::dirAdd( // Record new last node. sleNode = SLE::pointer(); - std::cerr << "dirAdd: last: " << strHex(uNodeDir) << std::endl; + Log(lsTRACE) << "dirAdd: last: " << strHex(uNodeDir); sleRoot->setIFieldU64(sfLastNode, uNodeDir); @@ -97,7 +97,7 @@ TransactionEngineResult TransactionEngine::dirAdd( sleNode = boost::make_shared(ltDIR_NODE); sleNode->setIndex(uNodeIndex); - std::cerr << "dirAdd: Creating dir node: " << sleNode->getIndex().ToString() << std::endl; + Log(lsTRACE) << "dirAdd: Creating dir node: " << sleNode->getIndex().ToString(); STVector256 svIndexes; @@ -123,7 +123,7 @@ TransactionEngineResult TransactionEngine::dirDelete( if (!sleNode) { - std::cerr << "dirDelete: no such node" << std::endl; + Log(lsWARNING) << "dirDelete: no such node"; return terNODE_NOT_FOUND; } else @@ -135,7 +135,7 @@ TransactionEngineResult TransactionEngine::dirDelete( it = std::find(vuiIndexes.begin(), vuiIndexes.end(), uLedgerIndex); if (vuiIndexes.end() == it) { - std::cerr << "dirDelete: node not mentioned" << std::endl; + Log(lsWARNING) << "dirDelete: node not mentioned"; return terNODE_NOT_MENTIONED; } else @@ -146,7 +146,7 @@ TransactionEngineResult TransactionEngine::dirDelete( if (!sleRoot) { - std::cerr << "dirDelete: root node is missing" << std::endl; + Log(lsWARNING) << "dirDelete: root node is missing"; return terNODE_NO_ROOT; } @@ -242,7 +242,7 @@ TransactionEngineResult TransactionEngine::setAuthorized(const SerializedTransac if (!naAccountPublic.accountPublicVerify(Serializer::getSHA512Half(vucCipher), vucSignature)) { - std::cerr << "createGenerator: bad signature unauthorized generator claim" << std::endl; + Log(lsWARNING) << "createGenerator: bad signature unauthorized generator claim"; return tenBAD_GEN_AUTH; } @@ -254,7 +254,7 @@ TransactionEngineResult TransactionEngine::setAuthorized(const SerializedTransac SLE::pointer sleGen = mLedger->getGenerator(qry, hGeneratorID); if (!sleGen) { - std::cerr << "createGenerator: creating generator" << std::endl; + Log(lsTRACE) << "createGenerator: creating generator"; // Create the generator. sleGen = boost::make_shared(ltGENERATOR_MAP); @@ -268,7 +268,7 @@ TransactionEngineResult TransactionEngine::setAuthorized(const SerializedTransac { // Doing a claim. Must set generator. // Generator is already in use. Regular passphrases limited to one wallet. - std::cerr << "createGenerator: generator already in use" << std::endl; + Log(lsWARNING) << "createGenerator: generator already in use"; return tenGEN_IN_USE; } @@ -288,7 +288,7 @@ TransactionEngineResult TransactionEngine::setAuthorized(const SerializedTransac TransactionEngineResult TransactionEngine::applyTransaction(const SerializedTransaction& txn, TransactionEngineParams params, uint32 targetLedger) { - std::cerr << "applyTransaction>" << std::endl; + Log(lsTRACE) << "applyTransaction>"; mLedger = mDefaultLedger; assert(mLedger); @@ -308,7 +308,7 @@ TransactionEngineResult TransactionEngine::applyTransaction(const SerializedTran SerializedTransaction s2(sit); if (!s2.isEquivalent(txn)) { - std::cerr << "Transaction serdes mismatch" << std::endl; + Log(lsFATAL) << "Transaction serdes mismatch"; Json::StyledStreamWriter ssw; ssw.write(Log(lsINFO).ref(), txn.getJson(0)); ssw.write(Log(lsFATAL).ref(), s2.getJson(0)); @@ -322,7 +322,7 @@ TransactionEngineResult TransactionEngine::applyTransaction(const SerializedTran uint256 txID = txn.getTransactionID(); if (!txID) { - std::cerr << "applyTransaction: invalid transaction id" << std::endl; + Log(lsWARNING) << "applyTransaction: invalid transaction id"; result = tenINVALID; } @@ -344,7 +344,7 @@ TransactionEngineResult TransactionEngine::applyTransaction(const SerializedTran // Consistency: really signed. if (terSUCCESS == result && !txn.checkSign(naSigningPubKey)) { - std::cerr << "applyTransaction: Invalid transaction: bad signature" << std::endl; + Log(lsWARNING) << "applyTransaction: Invalid transaction: bad signature"; result = tenINVALID; } @@ -389,12 +389,12 @@ TransactionEngineResult TransactionEngine::applyTransaction(const SerializedTran break; case ttINVALID: - std::cerr << "applyTransaction: Invalid transaction: ttINVALID transaction type" << std::endl; + Log(lsWARNING) << "applyTransaction: Invalid transaction: ttINVALID transaction type"; result = tenINVALID; break; default: - std::cerr << "applyTransaction: Invalid transaction: unknown transaction type" << std::endl; + Log(lsWARNING) << "applyTransaction: Invalid transaction: unknown transaction type"; result = tenUNKNOWN; break; } @@ -408,7 +408,7 @@ TransactionEngineResult TransactionEngine::applyTransaction(const SerializedTran { if (saPaid < saCost) { - std::cerr << "applyTransaction: insufficient fee" << std::endl; + Log(lsINFO) << "applyTransaction: insufficient fee"; result = tenINSUF_FEE_P; } @@ -418,7 +418,7 @@ TransactionEngineResult TransactionEngine::applyTransaction(const SerializedTran if (!saPaid.isZero()) { // Transaction is malformed. - std::cerr << "applyTransaction: fee not allowed" << std::endl; + Log(lsWARNING) << "applyTransaction: fee not allowed"; result = tenINSUF_FEE_P; } @@ -429,7 +429,7 @@ TransactionEngineResult TransactionEngine::applyTransaction(const SerializedTran uint160 srcAccountID = txn.getSourceAccount().getAccountID(); if (terSUCCESS == result && !srcAccountID) { - std::cerr << "applyTransaction: bad source id" << std::endl; + Log(lsWARNING) << "applyTransaction: bad source id"; result = tenINVALID; } @@ -455,7 +455,8 @@ TransactionEngineResult TransactionEngine::applyTransaction(const SerializedTran if (!sleSrc) { - std::cerr << str(boost::format("applyTransaction: Delay transaction: source account does not exist: %s") % txn.getSourceAccount().humanAccountID()) << std::endl; + Log(lsTRACE) << str(boost::format("applyTransaction: Delay transaction: source account does not exist: %s") % + txn.getSourceAccount().humanAccountID()); result = terNO_ACCOUNT; } @@ -473,7 +474,7 @@ TransactionEngineResult TransactionEngine::applyTransaction(const SerializedTran case ttCLAIM: if (bHaveAuthKey) { - std::cerr << "applyTransaction: Account already claimed." << std::endl; + Log(lsWARNING) << "applyTransaction: Account already claimed."; result = tenCLAIMED; } @@ -496,8 +497,8 @@ TransactionEngineResult TransactionEngine::applyTransaction(const SerializedTran if (naSigningPubKey.getAccountID() != srcAccountID) { // Signing Pub Key must be for Source Account ID. - std::cerr << "sourceAccountID: " << naSigningPubKey.humanAccountID() << std::endl; - std::cerr << "txn accountID: " << txn.getSourceAccount().humanAccountID() << std::endl; + Log(lsWARNING) << "sourceAccountID: " << naSigningPubKey.humanAccountID(); + Log(lsWARNING) << "txn accountID: " << txn.getSourceAccount().humanAccountID(); result = tenBAD_CLAIM_ID; } @@ -509,8 +510,8 @@ TransactionEngineResult TransactionEngine::applyTransaction(const SerializedTran if (naSigningPubKey.getAccountID() != srcAccountID) { // Signing Pub Key must be for Source Account ID. - std::cerr << "sourceAccountID: " << naSigningPubKey.humanAccountID() << std::endl; - std::cerr << "txn accountID: " << txn.getSourceAccount().humanAccountID() << std::endl; + Log(lsWARNING) << "sourceAccountID: " << naSigningPubKey.humanAccountID(); + Log(lsWARNING) << "txn accountID: " << txn.getSourceAccount().humanAccountID(); result = tenBAD_SET_ID; } @@ -573,12 +574,12 @@ TransactionEngineResult TransactionEngine::applyTransaction(const SerializedTran else if (!saCost.isZero()) { uint32 a_seq = sleSrc->getIFieldU32(sfSequence); - Log(lsINFO) << "Aseq=" << a_seq << ", Tseq=" << t_seq; + Log(lsTRACE) << "Aseq=" << a_seq << ", Tseq=" << t_seq; if (t_seq != a_seq) { if (a_seq < t_seq) { - std::cerr << "applyTransaction: future sequence number" << std::endl; + Log(lsTRACE) << "applyTransaction: future sequence number"; result = terPRE_SEQ; }