|
|
@ -1717,14 +1717,16 @@ static void *proxy_send(void *arg) |
|
|
|
|
|
|
|
|
|
|
|
static void passthrough_send(ckpool_t *ckp, pass_msg_t *pm) |
|
|
|
static void passthrough_send(ckpool_t *ckp, pass_msg_t *pm) |
|
|
|
{ |
|
|
|
{ |
|
|
|
|
|
|
|
connsock_t *cs = pm->cs; |
|
|
|
int len, sent; |
|
|
|
int len, sent; |
|
|
|
|
|
|
|
|
|
|
|
LOGDEBUG("Sending upstream json msg: %s", pm->msg); |
|
|
|
LOGDEBUG("Sending upstream json msg: %s", pm->msg); |
|
|
|
len = strlen(pm->msg); |
|
|
|
len = strlen(pm->msg); |
|
|
|
sent = write_socket(pm->cs->fd, pm->msg, len); |
|
|
|
sent = write_socket(cs->fd, pm->msg, len); |
|
|
|
if (sent != len) { |
|
|
|
if (unlikely(sent != len)) { |
|
|
|
LOGWARNING("Failed to passthrough %d bytes of message %s, attempting reconnect", |
|
|
|
LOGWARNING("Failed to passthrough %d bytes of message %s, attempting reconnect", |
|
|
|
len, pm->msg); |
|
|
|
len, pm->msg); |
|
|
|
|
|
|
|
Close(cs->fd); |
|
|
|
reconnect_generator(ckp); |
|
|
|
reconnect_generator(ckp); |
|
|
|
} |
|
|
|
} |
|
|
|
free(pm->msg); |
|
|
|
free(pm->msg); |
|
|
@ -1912,8 +1914,6 @@ static void *passthrough_recv(void *arg) |
|
|
|
} |
|
|
|
} |
|
|
|
sleep(5); |
|
|
|
sleep(5); |
|
|
|
} |
|
|
|
} |
|
|
|
if (!alive) |
|
|
|
|
|
|
|
reconnect_generator(ckp); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Make sure we receive a line within 90 seconds */ |
|
|
|
/* Make sure we receive a line within 90 seconds */ |
|
|
|
ret = read_socket_line(cs, &timeout); |
|
|
|
ret = read_socket_line(cs, &timeout); |
|
|
|