Browse Source

Fix failover of parent proxy

master
Con Kolivas 10 years ago
parent
commit
8476d12876
  1. 4
      src/generator.c

4
src/generator.c

@ -1753,8 +1753,8 @@ static void *proxy_recv(void *arg)
LOGWARNING("Proxy %d:%s recovered", proxi->id, proxi->si->url); LOGWARNING("Proxy %d:%s recovered", proxi->id, proxi->si->url);
proxi->reconnect_time = 0; proxi->reconnect_time = 0;
send_proc(ckp->generator, "reconnect"); send_proc(ckp->generator, "reconnect");
alive = true;
} }
alive = true;
now = time(NULL); now = time(NULL);
@ -1788,7 +1788,7 @@ static void *proxy_recv(void *arg)
ret = read_socket_line(cs, 5); ret = read_socket_line(cs, 5);
} }
if (ret < 1) { if (ret < 1) {
if (alive && parent_proxy(subproxy)) { if (parent_proxy(subproxy)) {
alive = false; alive = false;
LOGWARNING("Proxy %d:%s failed to epoll/read_socket_line in proxy_recv, attempting reconnect", LOGWARNING("Proxy %d:%s failed to epoll/read_socket_line in proxy_recv, attempting reconnect",
subproxy->id, subproxy->si->url); subproxy->id, subproxy->si->url);

Loading…
Cancel
Save