github-jwinterm/xmr-stak
1
0
Fork 0
mirror of https://github.com/jwinterm/xmr-stak.git synced 2026-10-23 06:38:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

v1.0.1 candidate - new more verbose level

Browse Source
This commit is contained in:
fireice-uk
2017-01-11 02:44:28 +00:00
parent 947cb8004f
commit fb6bf3ec4b
10 changed files with 86 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jconf.cpp
+11 -5
View File
@@ -35,7 +35,7 @@ using namespace rapidjson;
* This enum needs to match index in oConfigValues, otherwise we will get a runtime error
*/
enum configEnum { iCpuThreadNum, aCpuThreadsConf, sUseSlowMem, sPoolAddr,
sWalletAddr, sPoolPwd, iCallTimeout, iNetRetry, iVerboseLevel, bPreferIpv4 };
sWalletAddr, sPoolPwd, iCallTimeout, iNetRetry, iVerboseLevel, iAutohashTime, bPreferIpv4 };
struct configVal {
configEnum iName;
@@ -54,6 +54,7 @@ configVal oConfigValues[] = {
{ iCallTimeout, "call_timeout", kNumberType },
{ iNetRetry, "retry_time", kNumberType },
{ iVerboseLevel, "verbose_level", kNumberType },
{ iAutohashTime, "h_print_time", kNumberType },
{ bPreferIpv4, "prefer_ipv4", kTrueType }
};
@@ -174,9 +175,14 @@ uint64_t jconf::GetNetRetry()
return prv->configValues[iNetRetry]->GetUint64();
}
int64_t jconf::GetVerboseLevel()
uint64_t jconf::GetVerboseLevel()
{
return prv->configValues[iVerboseLevel]->GetInt64();
return prv->configValues[iVerboseLevel]->GetUint64();
}
uint64_t jconf::GetAutohashTime()
{
return prv->configValues[iAutohashTime]->GetUint64();
}
bool jconf::parse_config(const char* sFilename)
@@ -290,10 +296,10 @@ bool jconf::parse_config(const char* sFilename)
return false;
}
if(!prv->configValues[iVerboseLevel]->IsInt64())
if(!prv->configValues[iVerboseLevel]->IsUint64() || !prv->configValues[iAutohashTime]->IsUint64())
{
printer::inst()->print_msg(L0,
"Invalid config file. verbose_level has to be an integer.");
"Invalid config file. verbose_level and h_print_time need to be positive integers.");
return false;
}