ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-05 08:48:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into reserve

Browse Source
This commit is contained in:
Arthur Britto
2012-12-18 12:28:11 -08:00
parent b04aa198e6 d685ac2892
commit f72f6877b4
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/cpp/ripple/JobQueue.cpp
View File

@@ -5,6 +5,7 @@
#include <boost/thread.hpp> #include <boost/thread.hpp>
#include "Log.h" #include "Log.h"
#include "Config.h"
SETUP_LOG(); SETUP_LOG();
@@ -184,7 +185,9 @@ void JobQueue::shutdown()
void JobQueue::setThreadCount(int c) void JobQueue::setThreadCount(int c)
{ // set the number of thread serving the job queue to precisely this number { // set the number of thread serving the job queue to precisely this number
if (c == 0) if (theConfig.RUN_STANDALONE)
c = 1;
else if (c == 0)
{ {
c = boost::thread::hardware_concurrency(); c = boost::thread::hardware_concurrency();
if (c < 2) if (c < 2)

2
src/cpp/ripple/RPCHandler.cpp
View File

@@ -2319,7 +2319,7 @@ Json::Value RPCHandler::doCommand(Json::Value& jvRequest, int iRole)
{ "server_info", &RPCHandler::doServerInfo, true, false, optNone }, { "server_info", &RPCHandler::doServerInfo, true, false, optNone },
{ "stop", &RPCHandler::doStop, true, false, optNone }, { "stop", &RPCHandler::doStop, true, false, optNone },
{ "transaction_entry", &RPCHandler::doTransactionEntry, false, false, optCurrent }, { "transaction_entry", &RPCHandler::doTransactionEntry, false, false, optCurrent },
{ "tx", &RPCHandler::doTx, true, false, optNone }, { "tx", &RPCHandler::doTx, false, false, optNetwork },
{ "tx_history", &RPCHandler::doTxHistory, false, false, optNone }, { "tx_history", &RPCHandler::doTxHistory, false, false, optNone },
{ "unl_add", &RPCHandler::doUnlAdd, true, false, optNone }, { "unl_add", &RPCHandler::doUnlAdd, true, false, optNone },