markow
/
ckpool
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Improve warnings and verbosity for various proxy connection failures

master
Con Kolivas 10 years ago
parent
416b7a02eb
commit
4e95186403
1 changed files with 27 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 47
      src/generator.c

47
src/generator.c
Unescape View File

@ -554,7 +554,7 @@ static bool parse_subscribe(connsock_t *cs, proxy_instance_t *proxi)
retry: retry:
parsed = true; parsed = true;
if (!(buf = new_proxy_line(cs))) { if (!(buf = new_proxy_line(cs))) {
LOGWARNING("Proxy %d:%s failed to receive line in parse_subscribe", LOGNOTICE("Proxy %d:%s failed to receive line in parse_subscribe",
proxi->id, proxi->si->url); proxi->id, proxi->si->url);
goto out; goto out;
} }
@ -587,8 +587,8 @@ retry:
buf = NULL; buf = NULL;
goto retry; goto retry;
} }
LOGWARNING("Proxy %d:%s failed to parse subscribe response in parse_subscribe", LOGNOTICE("Proxy %d:%s failed to parse subscribe response in parse_subscribe",
proxi->id, proxi->si->url); proxi->id, proxi->si->url);
goto out; goto out;
} }
@ -631,9 +631,11 @@ retry:
goto out; goto out;
} }
if (size == 3 || (size == 4 && proxi->ckp->clientsvspeed)) if (size == 3 || (size == 4 && proxi->ckp->clientsvspeed))
LOGWARNING("Nonce2 length %d means proxied clients can't be >5TH each", size); LOGWARNING("Proxy %d:%s Nonce2 length %d means proxied clients can't be >5TH each",
proxi->id, proxi->si->url, size);
else if (size < 3) { else if (size < 3) {
LOGWARNING("Nonce2 length %d too small to be able to proxy", size); LOGWARNING("Proxy %d:%s Nonce2 length %d too small to be able to proxy",
proxi->id, proxi->si->url, size);
goto out; goto out;
} }
proxi->nonce2len = size; proxi->nonce2len = size;
@ -677,7 +679,7 @@ retry:
ret = send_json_msg(cs, req); ret = send_json_msg(cs, req);
json_decref(req); json_decref(req);
if (!ret) { if (!ret) {
LOGWARNING("Proxy %d:%s failed to send message in subscribe_stratum", LOGNOTICE("Proxy %d:%s failed to send message in subscribe_stratum",
proxi->id, proxi->si->url); proxi->id, proxi->si->url);
goto out; goto out;
} }
@ -686,23 +688,23 @@ retry:
goto out; goto out;
if (proxi->no_params) { if (proxi->no_params) {
LOGWARNING("Proxy %d:%s failed all subscription options in subscribe_stratum", LOGNOTICE("Proxy %d:%s failed all subscription options in subscribe_stratum",
proxi->id, proxi->si->url); proxi->id, proxi->si->url);
goto out; goto out;
} }
if (proxi->sessionid) { if (proxi->sessionid) {
LOGNOTICE("Proxy %d:%s failed sessionid reconnect in subscribe_stratum, retrying without", LOGINFO("Proxy %d:%s failed sessionid reconnect in subscribe_stratum, retrying without",
proxi->id, proxi->si->url); proxi->id, proxi->si->url);
proxi->no_sessionid = true; proxi->no_sessionid = true;
dealloc(proxi->sessionid); dealloc(proxi->sessionid);
} else { } else {
LOGNOTICE("Proxy %d:%s failed connecting with parameters in subscribe_stratum, retrying without", LOGINFO("Proxy %d:%s failed connecting with parameters in subscribe_stratum, retrying without",
proxi->id, proxi->si->url); proxi->id, proxi->si->url);
proxi->no_params = true; proxi->no_params = true;
} }
ret = connect_proxy(cs); ret = connect_proxy(cs);
if (!ret) { if (!ret) {
LOGWARNING("Proxy %d:%s failed to reconnect in subscribe_stratum", LOGNOTICE("Proxy %d:%s failed to reconnect in subscribe_stratum",
proxi->id, proxi->si->url); proxi->id, proxi->si->url);
goto out; goto out;
} }
@ -1046,7 +1048,8 @@ static bool auth_stratum(connsock_t *cs, proxy_instance_t *proxi)
ret = send_json_msg(cs, req); ret = send_json_msg(cs, req);
json_decref(req); json_decref(req);
if (!ret) { if (!ret) {
LOGWARNING("Failed to send message in auth_stratum"); LOGNOTICE("Proxy %d:%s failed to send message in auth_stratum",
proxi->id, proxi->si->url);
Close(cs->fd); Close(cs->fd);
goto out; goto out;
} }
@ -1057,7 +1060,8 @@ static bool auth_stratum(connsock_t *cs, proxy_instance_t *proxi)
free(buf); free(buf);
buf = next_proxy_line(cs, proxi); buf = next_proxy_line(cs, proxi);
if (!buf) { if (!buf) {
LOGWARNING("Failed to receive line in auth_stratum"); LOGNOTICE("Proxy %d:%s failed to receive line in auth_stratum",
proxi->id, proxi->si->url);
ret = false; ret = false;
goto out; goto out;
} }
@ -1066,25 +1070,28 @@ static bool auth_stratum(connsock_t *cs, proxy_instance_t *proxi)
val = json_msg_result(buf, &res_val, &err_val); val = json_msg_result(buf, &res_val, &err_val);
if (!val) { if (!val) {
LOGWARNING("Failed to get a json result in auth_stratum, got: %s", buf); LOGWARNING("Proxy %d:%s failed to get a json result in auth_stratum, got: %s",
proxi->id, proxi->si->url, buf);
goto out; goto out;
} }
if (err_val && !json_is_null(err_val)) { if (err_val && !json_is_null(err_val)) {
LOGWARNING("Failed to authorise in auth_stratum due to err_val, got: %s", buf); LOGWARNING("Proxy %d:%s failed to authorise in auth_stratum due to err_val, got: %s",
proxi->id, proxi->si->url, buf);
goto out; goto out;
} }
if (res_val) { if (res_val) {
ret = json_is_true(res_val); ret = json_is_true(res_val);
if (!ret) { if (!ret) {
LOGWARNING("Failed to authorise in auth_stratum"); LOGWARNING("Proxy %d:%s failed to authorise in auth_stratum",
proxi->id, proxi->si->url);
goto out; goto out;
} }
} else { } else {
/* No result and no error but successful val means auth success */ /* No result and no error but successful val means auth success */
ret = true; ret = true;
} }
LOGINFO("Auth success in auth_stratum"); LOGINFO("Proxy %d:%s auth success in auth_stratum", proxi->id, proxi->si->url);
out: out:
if (val) if (val)
json_decref(val); json_decref(val);
@ -1461,8 +1468,8 @@ static bool proxy_alive(ckpool_t *ckp, server_instance_t *si, proxy_instance_t *
/* Test we can connect, authorise and get stratum information */ /* Test we can connect, authorise and get stratum information */
if (!subscribe_stratum(cs, proxi)) { if (!subscribe_stratum(cs, proxi)) {
if (!pinging) { if (!pinging) {
LOGINFO("Failed initial subscribe to %s:%s !", LOGWARNING("Failed initial subscribe to %s:%s !",
cs->url, cs->port); cs->url, cs->port);
} }
goto out; goto out;
} }

Write Preview
Loading…
Cancel
Save