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

Merge branch 'dev' into feature-opencl

Browse source
This commit is contained in:
XMRig 2019-08-17 23:33:48 +07:00
commit bd07f1d455
121 changed files with 5477 additions and 369 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -134,6 +134,7 @@ bool xmrig::BaseConfig::read(const IJsonReader &reader, const char *fileName)
Log::colors = reader.getBool("colors", Log::colors);
m_logFile = reader.getString("log-file");
m_userAgent = reader.getString("user-agent");
m_version = reader.getUint("version");
setPrintTime(reader.getUint("print-time", 60));

4
src/base/kernel/config/BaseConfig.h
View file

@ -56,6 +56,7 @@ public:
inline const String &apiId() const { return m_apiId; }
inline const String &apiWorkerId() const { return m_apiWorkerId; }
inline uint32_t printTime() const { return m_printTime; }
inline uint32_t version() const { return m_version; }
inline bool isWatch() const override { return m_watch && !m_fileName.isNull(); }
inline const String &fileName() const override { return m_fileName; }
@ -80,7 +81,8 @@ protected:
String m_fileName;
String m_logFile;
String m_userAgent;
uint32_t m_printTime;
uint32_t m_printTime = 60;
uint32_t m_version = 0;
private:
inline void setPrintTime(uint32_t printTime) { if (printTime <= 3600) { m_printTime = printTime; } }