mempool/ckpool
mempool/ckpool
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Allow reconnect to take a :url,port extension to specify where to reconnect to

Browse Source
This commit is contained in:
ckolivas 2014-10-26 20:57:03 +11:00
parent 620d613d1a
commit cab3e94ada
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ckpool.c
View File

@ -296,7 +296,7 @@ retry:
send_unix_msg(sockd, "rejecting");
} else if (cmdmatch(buf, "reconnect")) {
LOGWARNING("Listener received request to send reconnect to clients");
send_procmsg(ckp->stratifier, "reconnect");
send_procmsg(ckp->stratifier, buf);
send_unix_msg(sockd, "reconnecting");
} else if (cmdmatch(buf, "restart")) {
LOGWARNING("Listener received restart message, attempting handover");

17
src/stratifier.c
View File

@ -1145,11 +1145,22 @@ static void stratum_broadcast_message(const char *msg)
/* Send a generic reconnect to all clients without parameters to make them
* reconnect to the same server. */
static void reconnect_clients(void)
static void reconnect_clients(const char *cmd)
{
char *port = strdupa(cmd), *url = NULL;
json_t *json_msg;
JSON_CPACK(json_msg, "{sosss[]}", "id", json_null(), "method", "client.reconnect",
strsep(&port, ":");
if (port)
url = strsep(&port, ",");
if (url && port) {
int port_no;
port_no = strtol(port, NULL, 10);
JSON_CPACK(json_msg, "{sosss[sii]}", "id", json_null(), "method", "client.reconnect",
"params", url, port_no, 0);
} else
JSON_CPACK(json_msg, "{sosss[]}", "id", json_null(), "method", "client.reconnect",
"params");
stratum_broadcast(json_msg);
}
@ -1347,7 +1358,7 @@ retry:
} else if (cmdmatch(buf, "noblock")) {
block_reject(buf + 8);
} else if (cmdmatch(buf, "reconnect")) {
reconnect_clients();
reconnect_clients(buf);
} else if (cmdmatch(buf, "loglevel")) {
sscanf(buf, "loglevel=%d", &ckp->loglevel);
} else {