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

Fixed Segfault when stopping server

Browse source
This commit is contained in:
Ben Gräf 2019-10-26 15:17:36 +02:00
parent 36db19cb02
commit f674dd47d4
2 changed files with 24 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

20
config_cc.json Normal file
View file

@ -0,0 +1,20 @@
{
"background": false, // true to run the cc-server in the background (no console)
"colors": true, // false to disable colored output
"log-file": null, // log all output to a file
"syslog": false, // use system log for output messages
"port": 1234, // port the CC Server will listens on
"use-tls" : false, // use tls for CC communication (needs to be enabled on miners too)
"cert-file" : "server.pem", // when tls is turned on, use this to point to the right cert file
"key-file" : "server.key", // when tls is turned on, use this to point to the right key file
"access-token": "P5häe7©'[*CKq{X7§^G{YI}6ê@I0z0ml3O<P}6Ã-1u3Y}±l0©?cO®3Ê.qS!&)]gZ", // access token for CC Clients (should be set!!!)
"user": "bendr0id", // admin user for access CC Dashboard
"pass": "¯S()#Eñ+w5rK2Ii0", // admin pass for access CC Dashboard
"client-config-folder" : null, // folder which contains the client-config files (null=current)
"custom-dashboard" : "index.html", // dashboard html file
"pushover-user-key" : "uxcyjgczey66k4rnyb2e3etbiu9dwy", // username to use for pushover notifications
"pushover-api-token" : "awgbtuod8r638ipxywdagwhgrmpbpt", // token to use for pushover notifications
"push-miner-offline-info" : true, // push notification for offline miners
"push-miner-zero-hash-info" : true, // push notification for offline miners
"push-periodic-mining-status" : true // push periodic (every hour) status notification
}

5
src/cc/Service.cpp
View file

@ -92,7 +92,10 @@ void Service::stop()
{
std::lock_guard<std::mutex> lock(m_mutex);
m_timer->stop();
if (m_timer)
{
m_timer->stop();
}
m_clientCommand.clear();
m_clientStatus.clear();