Browse Source

Disable and remove the parent proxy from the subproxy list on reconnect as well

master
Con Kolivas 10 years ago
parent
commit
3ba0aeee69
  1. 8
      src/generator.c

8
src/generator.c

@ -951,7 +951,8 @@ static void disable_subproxy(gdata_t *gdata, proxy_instance_t *proxi, proxy_inst
sprintf(buf, "deadproxy=%d:%d", subproxy->id, subproxy->subid); sprintf(buf, "deadproxy=%d:%d", subproxy->id, subproxy->subid);
send_proc(gdata->ckp->stratifier, buf); send_proc(gdata->ckp->stratifier, buf);
store_proxy(gdata, subproxy); if (!parent_proxy(subproxy))
store_proxy(gdata, subproxy);
} }
} }
@ -1815,15 +1816,14 @@ static void *proxy_recv(void *arg)
/* Call this proxy dead to allow us to fail /* Call this proxy dead to allow us to fail
* over to a backup pool until the reconnect * over to a backup pool until the reconnect
* pool is up */ * pool is up */
Close(cs->fd);
subproxy->alive = false; subproxy->alive = false;
disable_subproxy(gdata, proxi, subproxy);
if (parent_proxy(subproxy)) { if (parent_proxy(subproxy)) {
send_proc(ckp->generator, "reconnect"); send_proc(ckp->generator, "reconnect");
LOGWARNING("Proxy %d:%s reconnect issue, dropping existing connection", LOGWARNING("Proxy %d:%s reconnect issue, dropping existing connection",
subproxy->id, subproxy->si->url); subproxy->id, subproxy->si->url);
break; break;
} else }
disable_subproxy(gdata, proxi, subproxy);
} }
continue; continue;
} }

Loading…
Cancel
Save