From e513ef177fd272ae99c22c09c4d0df43e27d83e8 Mon Sep 17 00:00:00 2001 From: Arthur Britto Date: Mon, 15 Oct 2012 17:11:13 -0700 Subject: [PATCH] WS: Fix status of broadcasted transactions. --- src/NetworkOPs.cpp | 8 ++++---- src/WSDoor.cpp | 6 ++++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/NetworkOPs.cpp b/src/NetworkOPs.cpp index 1e6050469..c594c086f 100644 --- a/src/NetworkOPs.cpp +++ b/src/NetworkOPs.cpp @@ -992,12 +992,12 @@ void NetworkOPs::pubLedger(Ledger::ref lpAccepted) if (bAll) { - pubTransactionAll(lpAccepted, *stTxn, terResult, "closed"); + pubTransactionAll(lpAccepted, *stTxn, terResult, true); } if (bAccounts) { - pubTransactionAccounts(lpAccepted, *stTxn, terResult, "closed"); + pubTransactionAccounts(lpAccepted, *stTxn, terResult, true); } } } @@ -1099,12 +1099,12 @@ void NetworkOPs::pubTransaction(Ledger::ref lpCurrent, const SerializedTransacti if (!mSubTransaction.empty()) { - pubTransactionAll(lpCurrent, stTxn, terResult, "proposed"); + pubTransactionAll(lpCurrent, stTxn, terResult, false); } if (!mSubAccountTransaction.empty()) { - pubTransactionAccounts(lpCurrent, stTxn, terResult, "proposed"); + pubTransactionAccounts(lpCurrent, stTxn, terResult, false); } } diff --git a/src/WSDoor.cpp b/src/WSDoor.cpp index d0c23e2c7..0085026b4 100644 --- a/src/WSDoor.cpp +++ b/src/WSDoor.cpp @@ -17,6 +17,8 @@ #include "../json/reader.h" #include "../json/writer.h" +SETUP_LOG(); + // // This is a light weight, untrusted interface for web clients. // For now we don't provide proof. Later we will. @@ -145,7 +147,7 @@ public: { try { - // Log(lsINFO) << "Ws:: Sending '" << strMessage << "'"; + cLog(lsDEBUG) << "Ws:: Sending '" << strMessage << "'"; cpClient->send(strMessage); } @@ -159,7 +161,7 @@ public: { Json::FastWriter jfwWriter; - // Log(lsINFO) << "Ws:: Object '" << jfwWriter.write(jvObj) << "'"; + cLog(lsDEBUG) << "Ws:: Object '" << jfwWriter.write(jvObj) << "'"; send(cpClient, jfwWriter.write(jvObj)); }