ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-22 03:55:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor log_level command to meet new spec.

Browse Source
This commit is contained in:
JoelKatz
2012-12-05 13:18:14 -08:00
parent 48855b089f
commit a43a993a01
3 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/cpp/ripple/CallRPC.cpp
View File

@@ -210,6 +210,24 @@ Json::Value RPCParser::parseLogin(const Json::Value& jvParams)
return jvRequest; return jvRequest;
} }
// log_level: Get log levels
// log_level <severity>: Set master log level to the specified severity
// log_level <partition> <severity>: Set specified partition to specified severity
Json::Value RPCParser::parseLogLevel(const Json::Value& jvParams)
{
Json::Value jvRequest(Json::objectValue);
if (jvParams.size() == 1)
jvRequest["severity"] = jvParams[0u].asString();
else if (jvParams.size() == 2)
{
jvRequest["partition"] = jvParams[0u].asString();
jvRequest["severity"] = jvParams[1u].asString();
}
return jvRequest;
}
// owner_info <account>|<nickname>|<account_public_key> // owner_info <account>|<nickname>|<account_public_key>
// owner_info <seed>|<pass_phrase>|<key> [<index>] // owner_info <seed>|<pass_phrase>|<key> [<index>]
Json::Value RPCParser::parseOwnerInfo(const Json::Value& jvParams) Json::Value RPCParser::parseOwnerInfo(const Json::Value& jvParams)
@@ -405,7 +423,7 @@ Json::Value RPCParser::parseCommand(std::string strMethod, Json::Value jvParams)
{ "ledger_current", &RPCParser::parseAsIs, 0, 0 }, { "ledger_current", &RPCParser::parseAsIs, 0, 0 },
// { "ledger_entry", &RPCParser::parseLedgerEntry, -1, -1 }, // { "ledger_entry", &RPCParser::parseLedgerEntry, -1, -1 },
// { "ledger_header", &RPCParser::parseLedgerHeader, -1, -1 }, // { "ledger_header", &RPCParser::parseLedgerHeader, -1, -1 },
// { "log_level", &RPCParser::parseLogLevel, 0, 2 }, { "log_level", &RPCParser::parseLogLevel, 0, 2 },
{ "logrotate", &RPCParser::parseAsIs, 0, 0 }, { "logrotate", &RPCParser::parseAsIs, 0, 0 },
// { "nickname_info", &RPCParser::parseNicknameInfo, 1, 1 }, // { "nickname_info", &RPCParser::parseNicknameInfo, 1, 1 },
{ "owner_info", &RPCParser::parseOwnerInfo, 1, 2 }, { "owner_info", &RPCParser::parseOwnerInfo, 1, 2 },

1
src/cpp/ripple/CallRPC.h
View File

@@ -23,6 +23,7 @@ protected:
Json::Value parseGetCounts(const Json::Value& jvParams); Json::Value parseGetCounts(const Json::Value& jvParams);
Json::Value parseLedger(const Json::Value& jvParams); Json::Value parseLedger(const Json::Value& jvParams);
Json::Value parseLogin(const Json::Value& jvParams); Json::Value parseLogin(const Json::Value& jvParams);
Json::Value parseLogLevel(const Json::Value& jvParams);
Json::Value parseOwnerInfo(const Json::Value& jvParams); Json::Value parseOwnerInfo(const Json::Value& jvParams);
Json::Value parseRandom(const Json::Value& jvParams); Json::Value parseRandom(const Json::Value& jvParams);
Json::Value parseSubmit(const Json::Value& jvParams); Json::Value parseSubmit(const Json::Value& jvParams);

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

@@ -1570,10 +1570,10 @@ Json::Value RPCHandler::doGetCounts(Json::Value jvRequest)
return ret; return ret;
} }
Json::Value RPCHandler::doLogLevel(Json::Value params) Json::Value RPCHandler::doLogLevel(Json::Value jvRequest)
{ {
// log_level // log_level
if (params.size() == 0) if (!jvRequest.isMember("severity"))
{ // get log severities { // get log severities
Json::Value ret = Json::objectValue; Json::Value ret = Json::objectValue;
@@ -1587,35 +1587,29 @@ Json::Value RPCHandler::doLogLevel(Json::Value params)
return ret; return ret;
} }
// log_level severity LogSeverity sv = Log::stringToSeverity(jvRequest["severity"].asString());
if (params.size() == 1)
{ // set base log severity
LogSeverity sv = Log::stringToSeverity(params[0u].asString());
if (sv == lsINVALID) if (sv == lsINVALID)
return rpcError(rpcINVALID_PARAMS); return rpcError(rpcINVALID_PARAMS);
Log::setMinSeverity(sv,true); // log_level severity
if (!jvRequest.isMember("partition"))
{ // set base log severity
Log::setMinSeverity(sv, true);
return rpcError(rpcSUCCESS); return rpcError(rpcSUCCESS);
} }
// log_level partition severity base? // log_level partition severity base?
if (params.size() == 2) if (jvRequest.isMember("partition"))
{ // set partition severity { // set partition severity
LogSeverity sv = Log::stringToSeverity(params[1u].asString()); std::string partition(jvRequest["partition"].asString());
if (boost::iequals(partition, "base"))
if (sv == lsINVALID)
return rpcError(rpcINVALID_PARAMS);
if (params[2u].asString() == "base")
Log::setMinSeverity(sv,false); Log::setMinSeverity(sv,false);
else if (!LogPartition::setSeverity(params[0u].asString(), sv)) else if (!LogPartition::setSeverity(partition, sv))
return rpcError(rpcINVALID_PARAMS); return rpcError(rpcINVALID_PARAMS);
return rpcError(rpcSUCCESS); return rpcError(rpcSUCCESS);
} }
assert(false);
return rpcError(rpcINVALID_PARAMS); return rpcError(rpcINVALID_PARAMS);
} }