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

Fixed Uptime column in Dashboard

Browse source 
Implemented HTTPS for miner -> server and server -> dashboard
This commit is contained in:
BenDroid 2018-02-06 21:43:53 +01:00
parent 054b302ab5
commit 1330ffae0b
3 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/cc/CCClient.cpp
View file

@ -297,7 +297,7 @@ std::shared_ptr<httplib::Response> CCClient::performRequest(const std::string& r
void CCClient::refreshUptime()
{
std::chrono::time_point<std::chrono::system_clock> now = std::chrono::system_clock::now();
auto uptime = std::chrono::duration_cast<std::chrono::milliseconds>(m_self->m_startTime - now);
auto uptime = std::chrono::duration_cast<std::chrono::milliseconds>(now - m_self->m_startTime);
m_self->m_clientStatus.setUptime(static_cast<uint64_t>(uptime.count()));
}

4
src/cc/Httpd.cpp
View file

@ -59,8 +59,8 @@ bool Httpd::start()
m_daemon = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_SSL,
static_cast<uint16_t>(m_options->ccPort()), nullptr, nullptr, &Httpd::handler,
this, MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) 10,
MHD_OPTION_HTTPS_MEM_KEY, m_keyPem,
MHD_OPTION_HTTPS_MEM_CERT, m_certPem,
MHD_OPTION_HTTPS_MEM_KEY, m_keyPem.c_str(),
MHD_OPTION_HTTPS_MEM_CERT, m_certPem.c_str(),
MHD_OPTION_END);
}
# endif