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

Fix connection issues and add enhancement to the Dashboard (#130)

Browse source 
* Fix connection errors when doing DNS lookup
* Fix connection handling when an error occurs
* Add remote logging feature
* Add algo variant to dashboard
This commit is contained in:
Ben Gräf 2018-06-12 09:15:04 +02:00 • committed by GitHub
parent 872fce72b5
commit b379f21cb3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 377 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/cc/ClientStatus.cpp
View file

@ -98,6 +98,16 @@ std::string ClientStatus::getCurrentAlgoName() const
return m_currentAlgoName;
}
void ClientStatus::setCurrentPowVariantName(const std::string& powVariantName)
{
m_currentPowVariantName = powVariantName;
}
std::string ClientStatus::getCurrentPowVariantName() const
{
return m_currentPowVariantName;
}
std::string ClientStatus::getCpuBrand() const
{
return m_cpuBrand;
@ -128,6 +138,16 @@ void ClientStatus::setVersion(const std::string& version)
m_version = version;
}
std::string ClientStatus::getLog() const
{
return m_log;
}
void ClientStatus::setLog(const std::string& log)
{
m_log = log;
}
bool ClientStatus::hasHugepages() const
{
return m_hasHugepages;
@ -356,6 +376,10 @@ bool ClientStatus::parseFromJson(const rapidjson::Document& document)
m_currentAlgoName = clientStatus["current_algo_name"].GetString();
}
if (clientStatus.HasMember("current_pow_variant_name")) {
m_currentPowVariantName = clientStatus["current_pow_variant_name"].GetString();
}
if (clientStatus.HasMember("cpu_brand")) {
m_cpuBrand = clientStatus["cpu_brand"].GetString();
}
@ -368,6 +392,10 @@ bool ClientStatus::parseFromJson(const rapidjson::Document& document)
m_version = clientStatus["version"].GetString();
}
if (clientStatus.HasMember("log")) {
m_log = clientStatus["log"].GetString();
}
if (clientStatus.HasMember("hugepages_available")) {
m_hasHugepages = clientStatus["hugepages_available"].GetBool();
}
@ -468,6 +496,7 @@ rapidjson::Value ClientStatus::toJson(rapidjson::MemoryPoolAllocator<rapidjson::
clientStatus.AddMember("client_id", rapidjson::StringRef(m_clientId.c_str()), allocator);
clientStatus.AddMember("current_pool", rapidjson::StringRef(m_currentPool.c_str()), allocator);
clientStatus.AddMember("current_algo_name", rapidjson::StringRef(m_currentAlgoName.c_str()), allocator);
clientStatus.AddMember("current_pow_variant_name", rapidjson::StringRef(m_currentPowVariantName.c_str()), allocator);
clientStatus.AddMember("cpu_brand", rapidjson::StringRef(m_cpuBrand.c_str()), allocator);
clientStatus.AddMember("external_ip", rapidjson::StringRef(m_externalIp.c_str()), allocator);
clientStatus.AddMember("version", rapidjson::StringRef(m_version.c_str()), allocator);
@ -500,6 +529,9 @@ rapidjson::Value ClientStatus::toJson(rapidjson::MemoryPoolAllocator<rapidjson::
clientStatus.AddMember("last_status_update", static_cast<uint64_t >(m_lastStatusUpdate), allocator);
clientStatus.AddMember("log", rapidjson::StringRef(m_log.c_str()), allocator);
return clientStatus;
}