|
|
@ -1692,8 +1692,8 @@ reconnect: |
|
|
|
proxi = cproxy; |
|
|
|
proxi = cproxy; |
|
|
|
if (!ckp->passthrough) { |
|
|
|
if (!ckp->passthrough) { |
|
|
|
connsock_t *cs = proxi->cs; |
|
|
|
connsock_t *cs = proxi->cs; |
|
|
|
LOGWARNING("Successfully connected to %s:%s as proxy", |
|
|
|
LOGWARNING("Successfully connected to proxy %d %s:%s as proxy", |
|
|
|
cs->url, cs->port); |
|
|
|
proxi->id, cs->url, cs->port); |
|
|
|
dealloc(buf); |
|
|
|
dealloc(buf); |
|
|
|
ASPRINTF(&buf, "proxy=%d", proxi->id); |
|
|
|
ASPRINTF(&buf, "proxy=%d", proxi->id); |
|
|
|
send_proc(ckp->stratifier, buf); |
|
|
|
send_proc(ckp->stratifier, buf); |
|
|
@ -1710,7 +1710,8 @@ retry: |
|
|
|
} while (selret < 1); |
|
|
|
} while (selret < 1); |
|
|
|
|
|
|
|
|
|
|
|
if (unlikely(proxi->cs->fd < 0)) { |
|
|
|
if (unlikely(proxi->cs->fd < 0)) { |
|
|
|
LOGWARNING("Upstream socket invalidated, will attempt failover"); |
|
|
|
LOGWARNING("Upstream proxy %d:%s socket invalidated, will attempt failover", |
|
|
|
|
|
|
|
proxi->id, proxi->cs->url); |
|
|
|
proxi->alive = false; |
|
|
|
proxi->alive = false; |
|
|
|
proxi = NULL; |
|
|
|
proxi = NULL; |
|
|
|
goto reconnect; |
|
|
|
goto reconnect; |
|
|
|