Fix two minor bugs with reporting load fees.

This commit is contained in:
JoelKatz
2013-02-11 23:30:35 -08:00
parent 61c84eba2e
commit 7d8624d0e7
2 changed files with 3 additions and 3 deletions

View File

@@ -247,8 +247,8 @@ bool LoadFeeTrack::raiseLocalFee()
boost::mutex::scoped_lock sl(mLock);
uint32 origFee = mLocalTxnLoadFee;
if (mLocalTxnLoadFee < mLocalTxnLoadFee) // make sure this fee takes effect
mLocalTxnLoadFee = mLocalTxnLoadFee;
if (mLocalTxnLoadFee < mRemoteTxnLoadFee) // make sure this fee takes effect
mLocalTxnLoadFee = mRemoteTxnLoadFee;
mLocalTxnLoadFee += (mLocalTxnLoadFee / lftFeeIncFraction); // increment by 1/16th

View File

@@ -1163,7 +1163,7 @@ Json::Value NetworkOPs::getServerInfo(bool human, bool admin)
}
else
info["load_factor"] =
static_cast<double>(theApp->getFeeTrack().getLoadBase()) / theApp->getFeeTrack().getLoadFactor();
static_cast<double>(theApp->getFeeTrack().getLoadFactor()) / theApp->getFeeTrack().getLoadBase();
bool valid = false;
Ledger::pointer lpClosed = getValidatedLedger();