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

Refactor RPCSub to remove Application dependency

Browse Source
This commit is contained in:
Vinnie Falco
2013-08-31 21:35:30 -07:00
parent 1391a11e46
commit 01fda4c30e
4 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/ripple_app/main/ripple_Application.cpp
View File

@@ -631,7 +631,8 @@ public:
catch (const std::exception& e) catch (const std::exception& e)
{ {
// Must run as directed or exit. // Must run as directed or exit.
WriteLog (lsFATAL, Application) << boost::str (boost::format ("Can not open RPC service: %s") % e.what ()); WriteLog (lsFATAL, Application) <<
"Can not open RPC service: " << e.what ();
exit (3); exit (3);
} }

3
modules/ripple_app/rpc/RPCHandler.cpp
View File

@@ -3233,7 +3233,8 @@ Json::Value RPCHandler::doSubscribe (Json::Value params, LoadType* loadType, App
{ {
WriteLog (lsDEBUG, RPCHandler) << boost::str (boost::format ("doSubscribe: building: %s") % strUrl); WriteLog (lsDEBUG, RPCHandler) << boost::str (boost::format ("doSubscribe: building: %s") % strUrl);
RPCSub::pointer rspSub = boost::make_shared<RPCSub> (strUrl, strUsername, strPassword); RPCSub::pointer rspSub = boost::make_shared<RPCSub> (getApp ().getIOService (),
getApp ().getJobQueue (), strUrl, strUsername, strPassword);
ispSub = mNetOps->addRpcSub (strUrl, boost::dynamic_pointer_cast<InfoSub> (rspSub)); ispSub = mNetOps->addRpcSub (strUrl, boost::dynamic_pointer_cast<InfoSub> (rspSub));
} }
else else

15
modules/ripple_app/rpc/RPCSub.cpp
View File

@@ -6,8 +6,15 @@
SETUP_LOG (RPCSub) SETUP_LOG (RPCSub)
RPCSub::RPCSub (const std::string& strUrl, const std::string& strUsername, const std::string& strPassword) RPCSub::RPCSub (boost::asio::io_service& io_service, JobQueue& jobQueue,
: mUrl (strUrl), mSSL (false), mUsername (strUsername), mPassword (strPassword), mSending (false) const std::string& strUrl, const std::string& strUsername, const std::string& strPassword)
: m_io_service (io_service)
, m_jobQueue (jobQueue)
, mUrl (strUrl)
, mSSL (false)
, mUsername (strUsername)
, mPassword (strPassword)
, mSending (false)
{ {
std::string strScheme; std::string strScheme;
@@ -75,7 +82,7 @@ void RPCSub::sendThread ()
WriteLog (lsINFO, RPCSub) << boost::str (boost::format ("callRPC calling: %s") % mIp); WriteLog (lsINFO, RPCSub) << boost::str (boost::format ("callRPC calling: %s") % mIp);
callRPC ( callRPC (
getApp().getIOService (), m_io_service,
mIp, mPort, mIp, mPort,
mUsername, mPassword, mUsername, mPassword,
mPath, "event", mPath, "event",
@@ -113,7 +120,7 @@ void RPCSub::send (const Json::Value& jvObj, bool broadcast)
WriteLog (lsINFO, RPCSub) << boost::str (boost::format ("callRPC start")); WriteLog (lsINFO, RPCSub) << boost::str (boost::format ("callRPC start"));
getApp().getJobQueue ().addJob ( m_jobQueue.addJob (
jtCLIENT, "RPCSub::sendThread", BIND_TYPE (&RPCSub::sendThread, this)); jtCLIENT, "RPCSub::sendThread", BIND_TYPE (&RPCSub::sendThread, this));
} }
} }

7
modules/ripple_app/rpc/RPCSub.h
View File

@@ -18,7 +18,9 @@ public:
typedef boost::shared_ptr<RPCSub> pointer; typedef boost::shared_ptr<RPCSub> pointer;
typedef const pointer& ref; typedef const pointer& ref;
RPCSub (const std::string& strUrl, const std::string& strUsername, const std::string& strPassword); RPCSub (boost::asio::io_service& io_service,
JobQueue& jobQueue, const std::string& strUrl,
const std::string& strUsername, const std::string& strPassword);
virtual ~RPCSub () virtual ~RPCSub ()
{ {
@@ -46,6 +48,9 @@ protected:
void sendThread (); void sendThread ();
private: private:
boost::asio::io_service& m_io_service;
JobQueue& m_jobQueue;
std::string mUrl; std::string mUrl;
std::string mIp; std::string mIp;
int mPort; int mPort;