mirrors/xmrig
1
0
Fork 1
mirror of https://github.com/xmrig/xmrig.git synced 2026-06-23 20:22:37 -04:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
MoneroOcean
2019-12-21 18:18:26 -08:00
parent 4540208c9d 8f2a92c3ec
commit eb58aea9c7
48 changed files with 970 additions and 454 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/config/Config.cpp
View File

@@ -219,7 +219,7 @@ void xmrig::Config::getJSON(rapidjson::Document &doc) const
doc.AddMember("http", m_http.toJSON(doc), allocator);
doc.AddMember("autosave", isAutoSave(), allocator);
doc.AddMember("background", isBackground(), allocator);
doc.AddMember("colors", Log::colors, allocator);
doc.AddMember("colors", Log::isColors(), allocator);
# ifdef XMRIG_ALGO_RANDOMX
doc.AddMember(StringRef(kRandomX), rx().toJSON(doc), allocator);
@@ -247,6 +247,7 @@ void xmrig::Config::getJSON(rapidjson::Document &doc) const
doc.AddMember("retry-pause", m_pools.retryPause(), allocator);
doc.AddMember("syslog", isSyslog(), allocator);
doc.AddMember("user-agent", m_userAgent.toJSON(), allocator);
doc.AddMember("verbose", Log::verbose(), allocator);
doc.AddMember("watch", m_watch, allocator);
doc.AddMember("algo-perf", m_benchmark.toJSON(doc), allocator);