mirror of
https://github.com/Xahau/xahaud.git
synced 2025-12-06 17:27:52 +00:00
Merge branch 'master' of github.com:jedmccaleb/NewCoin
This commit is contained in:
@@ -1548,52 +1548,47 @@ Json::Value RPCHandler::doGetCounts(Json::Value jvRequest)
|
||||
return ret;
|
||||
}
|
||||
|
||||
Json::Value RPCHandler::doLogLevel(Json::Value params)
|
||||
Json::Value RPCHandler::doLogLevel(Json::Value jvRequest)
|
||||
{
|
||||
// log_level
|
||||
if (params.size() == 0)
|
||||
if (!jvRequest.isMember("severity"))
|
||||
{ // get log severities
|
||||
Json::Value ret = Json::objectValue;
|
||||
|
||||
ret["base"] = Log::severityToString(Log::getMinSeverity());
|
||||
Json::Value ret(Json::objectValue);
|
||||
Json::Value lev(Json::objectValue);
|
||||
|
||||
lev["base"] = Log::severityToString(Log::getMinSeverity());
|
||||
std::vector< std::pair<std::string, std::string> > logTable = LogPartition::getSeverities();
|
||||
typedef std::pair<std::string, std::string> stringPair;
|
||||
BOOST_FOREACH(const stringPair& it, logTable)
|
||||
ret[it.first] = it.second;
|
||||
lev[it.first] = it.second;
|
||||
|
||||
ret["levels"] = lev;
|
||||
return ret;
|
||||
}
|
||||
|
||||
LogSeverity sv = Log::stringToSeverity(jvRequest["severity"].asString());
|
||||
if (sv == lsINVALID)
|
||||
return rpcError(rpcINVALID_PARAMS);
|
||||
|
||||
// log_level severity
|
||||
if (params.size() == 1)
|
||||
if (!jvRequest.isMember("partition"))
|
||||
{ // set base log severity
|
||||
LogSeverity sv = Log::stringToSeverity(params[0u].asString());
|
||||
if (sv == lsINVALID)
|
||||
return rpcError(rpcINVALID_PARAMS);
|
||||
|
||||
Log::setMinSeverity(sv,true);
|
||||
|
||||
Log::setMinSeverity(sv, true);
|
||||
return rpcError(rpcSUCCESS);
|
||||
}
|
||||
|
||||
// log_level partition severity base?
|
||||
if (params.size() == 2)
|
||||
if (jvRequest.isMember("partition"))
|
||||
{ // set partition severity
|
||||
LogSeverity sv = Log::stringToSeverity(params[1u].asString());
|
||||
|
||||
if (sv == lsINVALID)
|
||||
return rpcError(rpcINVALID_PARAMS);
|
||||
|
||||
if (params[2u].asString() == "base")
|
||||
std::string partition(jvRequest["partition"].asString());
|
||||
if (boost::iequals(partition, "base"))
|
||||
Log::setMinSeverity(sv,false);
|
||||
else if (!LogPartition::setSeverity(params[0u].asString(), sv))
|
||||
else if (!LogPartition::setSeverity(partition, sv))
|
||||
return rpcError(rpcINVALID_PARAMS);
|
||||
|
||||
return rpcError(rpcSUCCESS);
|
||||
}
|
||||
|
||||
assert(false);
|
||||
return rpcError(rpcINVALID_PARAMS);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user