From bc5781e05dd4c9276299443d5fb7d5a9eba0420f Mon Sep 17 00:00:00 2001
From: JoelKatz <DavidJoelSchwartz@GMail.com>
Date: Wed, 3 Jul 2013 12:36:37 -0700
Subject: [PATCH] Load manager fixes.

---
 src/cpp/ripple/ripple_LoadManager.cpp |  3 ++-
 src/cpp/ripple/ripple_Peer.cpp        | 28 +++++++++++++++++++++++----
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/cpp/ripple/ripple_LoadManager.cpp b/src/cpp/ripple/ripple_LoadManager.cpp
index 6bd6004c15..5d071f7234 100644
--- a/src/cpp/ripple/ripple_LoadManager.cpp
+++ b/src/cpp/ripple/ripple_LoadManager.cpp
@@ -210,7 +210,8 @@ private:
         if (source.isPrivileged ()) // privileged sources never warn/cutoff
             return false;
 
-        if ((source.mBalance >= mDebitLimit) && (source.mLastWarning == now)) // no need to warn
+        if ( (source.mBalance >= mDebitWarn) ||
+            ((source.mBalance >= mDebitLimit) && (source.mLastWarning == now)))
             return false;
 
         return true;
diff --git a/src/cpp/ripple/ripple_Peer.cpp b/src/cpp/ripple/ripple_Peer.cpp
index 45496f9e94..46838975ff 100644
--- a/src/cpp/ripple/ripple_Peer.cpp
+++ b/src/cpp/ripple/ripple_Peer.cpp
@@ -198,7 +198,7 @@ PeerImp::PeerImp (boost::asio::io_service& io_service, boost::asio::ssl::context
     mCluster (false),
     mPeerId (peerID),
     mPrivate (false),
-    mLoad (""),
+    mLoad (std::string()),
     mMinLedger (0),
     mMaxLedger (0),
     mSocketSsl (io_service, ctx),
@@ -975,6 +975,8 @@ void PeerImp::recvHello (protocol::TMHello& packet)
         {
             mCluster = true;
             mLoad.setPrivileged ();
+            if (!mNodeName.empty())
+                mLoad.rename (mNodeName);
             WriteLog (lsINFO, Peer) << "Cluster connection to \"" << (mNodeName.empty () ? getIP () : mNodeName)
                                     << "\" established";
         }
@@ -1121,6 +1123,7 @@ void PeerImp::recvTransaction (protocol::TMTransaction& packet, ScopedLock& Mast
         if (theApp->getMasterTransaction().fetch(txID, true))
         {
             WriteLog (lsDEBUG, Peer) << "Peer " << getDisplayName() << " send old TX " << txID;
+            applyLoadCharge (LT_InvalidRequest);
             return;
         }
 
@@ -2217,11 +2220,28 @@ void PeerImp::sendGetPeers ()
 
 void PeerImp::applyLoadCharge (LoadType loadType)
 {
+    // IMPLEMENATION IS INCOMPLETE
+
+    // VFALCO TODO This needs to implemented before open sourcing.
+
     if (theApp->getLoadManager ().applyLoadCharge (mLoad, loadType))
     {
-        // UNIMPLEMENTED
-
-        // VFALCO TODO This needs to implemented before open sourcing.
+        if (mCluster)
+        {
+            WriteLog (lsWARNING, Peer) << "aLC: " << getDisplayName() << " load from cluster";
+        }
+        else if (theApp->getLoadManager ().shouldCutoff(mLoad))
+        {
+            WriteLog (lsWARNING, Peer) << "aLC: " << getDisplayName() << " should cutoff";
+        }
+        else if (theApp->getLoadManager ().shouldWarn (mLoad))
+        {
+            WriteLog (lsWARNING, Peer) << "aLC: " << getDisplayName() << " load warning";
+        }
+        else
+        {
+            WriteLog (lsWARNING, Peer) << "aLC: " << getDisplayName() << " cannot figure out";
+        }
     }
 }