ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

New Resource::Manager for controlling access to server resources

Browse Source
This commit is contained in:
Vinnie Falco
2013-10-11 15:00:17 -07:00
parent 0902af8eb5
commit a1b487c512
53 changed files with 2494 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/ripple_app/websocket/WSConnection.cpp
View File

@@ -28,9 +28,12 @@ static std::string trimIP(const std::string& ip)
//------------------------------------------------------------------------------
WSConnection::WSConnection (InfoSub::Source& source, bool isPublic,
std::string const& remoteIP, boost::asio::io_service& io_service)
WSConnection::WSConnection (Resource::Manager& resourceManager,
Resource::Consumer usage, InfoSub::Source& source, bool isPublic,
std::string const& remoteIP, boost::asio::io_service& io_service)
: InfoSub (source)
, m_resourceManager (resourceManager)
, m_usage (usage)
, m_isPublic (isPublic)
, m_remoteIP (remoteIP)
, m_receiveQueueMutex (this, "WSConnection", __FILE__, __LINE__)
@@ -110,12 +113,19 @@ void WSConnection::returnMessage (message_ptr ptr)
Json::Value WSConnection::invokeCommand (Json::Value& jvRequest)
{
// VFALCO TODO Make LoadManager a ctor argument
#if RIPPLE_USE_RESOURCE_MANAGER
if (m_usage.disconnect ())
{
disconnect ();
return rpcError (rpcSLOW_DOWN);
}
#else
if (getApp().getLoadManager ().shouldCutoff (m_loadSource))
{
disconnect ();
return rpcError (rpcSLOW_DOWN);
}
#endif
// Requests without "command" are invalid.
//
@@ -133,7 +143,11 @@ Json::Value WSConnection::invokeCommand (Json::Value& jvRequest)
jvResult["id"] = jvRequest["id"];
}
#if RIPPLE_USE_RESOURCE_MANAGER
m_usage.charge (Resource::feeInvalidRPC);
#else
getApp().getLoadManager ().applyLoadCharge (m_loadSource, LT_RPCInvalid);
#endif
return jvResult;
}
@@ -155,6 +169,13 @@ Json::Value WSConnection::invokeCommand (Json::Value& jvRequest)
jvResult["result"] = mRPCHandler.doCommand (jvRequest, role, &loadType);
}
#if RIPPLE_USE_RESOURCE_MANAGER
m_usage.charge (Resource::legacyFee (loadType));
if (m_usage.warn ())
{
jvResult["warning"] = "load";
}
#else
// Debit/credit the load and see if we should include a warning.
//
if (getApp().getLoadManager ().applyLoadCharge (m_loadSource, loadType) &&
@@ -162,6 +183,7 @@ Json::Value WSConnection::invokeCommand (Json::Value& jvRequest)
{
jvResult["warning"] = "load";
}
#endif
// Currently we will simply unwrap errors returned by the RPC
// API, in the future maybe we can make the responses