Merge branch 'master' of https://bitbucket.org/ckolivas/ckpool
This commit is contained in:
commit
3a1cd8b79d
@ -1289,6 +1289,8 @@ retry:
|
||||
break;
|
||||
}
|
||||
if (!alive) {
|
||||
send_proc(ckp->stratifier, "dropall");
|
||||
send_proc(ckp->connector, "reject");
|
||||
if (!ckp->chosen_server) {
|
||||
LOGWARNING("Failed to connect to any servers as proxy, retrying in 5s!");
|
||||
sleep(5);
|
||||
|
||||
@ -1536,6 +1536,10 @@ void decay_time(double *f, double fadd, double fsecs, double interval)
|
||||
ftotal = 1.0 + fprop;
|
||||
*f += (fadd / fsecs * fprop);
|
||||
*f /= ftotal;
|
||||
/* Sanity check to prevent meaningless super small numbers that
|
||||
* eventually underflow libjansson's real number interpretation. */
|
||||
if (unlikely(*f < 2E-16))
|
||||
*f = 0;
|
||||
}
|
||||
|
||||
/* Convert a double value into a truncated string for displaying with its
|
||||
|
||||
@ -1090,6 +1090,8 @@ retry:
|
||||
LOGDEBUG("Stratifier failed to parse dropclient command: %s", buf);
|
||||
else
|
||||
drop_client(client_id);
|
||||
} else if (cmdmatch(buf, "dropall")) {
|
||||
drop_allclients(ckp);
|
||||
} else if (cmdmatch(buf, "block")) {
|
||||
block_solve(ckp);
|
||||
} else if (cmdmatch(buf, "loglevel")) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user