fzorb/REDACTED-rig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge https://github.com/xmrig/xmrig

Browse source
This commit is contained in:
MoneroOcean 2020-05-23 11:13:42 -07:00
commit 51c783a313
191 changed files with 1417 additions and 2600 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/base/kernel/config/BaseConfig.cpp
View file

@ -24,13 +24,14 @@
#include "base/kernel/config/BaseConfig.h"
#include "3rdparty/rapidjson/document.h"
#include "base/io/json/Json.h"
#include "base/io/log/Log.h"
#include "base/kernel/interfaces/IJsonReader.h"
#include "rapidjson/document.h"
#include "version.h"
#include <algorithm>
#include <cassert>
#include <cstdio>
#include <cstdlib>
@ -89,6 +90,7 @@ bool xmrig::BaseConfig::read(const IJsonReader &reader, const char *fileName)
m_watch = reader.getBool(kWatch, m_watch);
m_logFile = reader.getString(kLogFile);
m_userAgent = reader.getString(kUserAgent);
m_printTime = std::min(reader.getUint(kPrintTime, m_printTime), 3600U);
m_rebenchAlgo = reader.getBool("rebench-algo", m_rebenchAlgo);
m_benchAlgoTime = reader.getInt("bench-algo-time", m_benchAlgoTime);
@ -98,7 +100,6 @@ bool xmrig::BaseConfig::read(const IJsonReader &reader, const char *fileName)
# endif
Log::setColors(reader.getBool(kColors, Log::isColors()));
setPrintTime(reader.getUint(kPrintTime, 60));
setVerbose(reader.getValue(kVerbose));
const auto &api = reader.getObject(kApi);