ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't claim to support HTTP keep alives and then close the connection. This

Browse Source 
properly supports HTTP keep alives and should speed up RPC significantly.
This commit is contained in:
JoelKatz
2012-06-27 12:04:35 -07:00
parent 48de3f3a02
commit dbabc6edd0
2 changed files with 35 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/RPCServer.cpp
View File

@@ -116,7 +116,7 @@ void RPCServer::handle_read(const boost::system::error_code& e,
if (result)
{
mReplyStr=handleRequest(mIncomingRequest.mBody);
mReplyStr = handleRequest(mIncomingRequest.mBody);
sendReply();
}
@@ -147,7 +147,7 @@ std::string RPCServer::handleRequest(const std::string& requestStr)
Json::Value valRequest;
Json::Reader reader;
if (!reader.parse(requestStr, valRequest) || valRequest.isNull() || !valRequest.isObject())
return(HTTPReply(400, ""));
return(HTTPReply(400, "unable to parse request"));
// Parse id now so errors from here on will have the id
id = valRequest["id"];
@@ -155,9 +155,9 @@ std::string RPCServer::handleRequest(const std::string& requestStr)
// Parse method
Json::Value valMethod = valRequest["method"];
if (valMethod.isNull())
return(HTTPReply(400, ""));
return(HTTPReply(400, "null method"));
if (!valMethod.isString())
return(HTTPReply(400, ""));
return(HTTPReply(400, "method is not string"));
std::string strMethod = valMethod.asString();
// Parse params
@@ -165,7 +165,7 @@ std::string RPCServer::handleRequest(const std::string& requestStr)
if (valParams.isNull())
valParams = Json::Value(Json::arrayValue);
else if (!valParams.isArray())
return(HTTPReply(400, ""));
return(HTTPReply(400, "parms unparseable"));
Json::StyledStreamWriter w;
w.write(Log(lsTRACE).ref(), valParams);
@@ -2095,9 +2095,34 @@ void RPCServer::handle_write(const boost::system::error_code& e)
if (!e)
{
// Initiate graceful connection closure.
boost::system::error_code ignored_ec;
mSocket.shutdown(boost::asio::ip::tcp::socket::shutdown_both, ignored_ec);
bool keep_alive = (mIncomingRequest.http_version_major == 1) && (mIncomingRequest.http_version_minor >= 1);
BOOST_FOREACH(HttpHeader& h, mIncomingRequest.headers)
{
if (boost::iequals(h.name, "connection"))
{
if (boost::iequals(h.value, "keep-alive"))
keep_alive = true;
if (boost::iequals(h.value, "close"))
keep_alive = false;
}
}
if (keep_alive)
{
mIncomingRequest.method.clear();
mIncomingRequest.uri.clear();
mIncomingRequest.mBody.clear();
mIncomingRequest.headers.clear();
mRequestParser.reset();
mSocket.async_read_some(boost::asio::buffer(mReadBuffer),
boost::bind(&RPCServer::handle_read, shared_from_this(),
boost::asio::placeholders::error,
boost::asio::placeholders::bytes_transferred));
}
else
{
boost::system::error_code ignored_ec;
mSocket.shutdown(boost::asio::ip::tcp::socket::shutdown_both, ignored_ec);
}
}
if (e != boost::asio::error::operation_aborted)