Rooba
/
odyssey
mirror of https://github.com/yandex/odyssey.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

odissey: do reattach if server connection lost on attach

This commit is contained in:
Dmitry Simonenko 2018-02-07 12:59:55 +03:00
parent a4ea499813
commit 60a5d18e77
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sources/frontend.c
View File

@ -259,15 +259,27 @@ od_frontend_attach(od_client_t *client, char *context)
od_routerstatus_t status;
od_server_t *server;
for (;;)
{
status = od_router_attach(client);
if (status != OD_ROK)
return OD_FE_EATTACH;
server = client->server;
if (server->io && !machine_connected(server->io)) {
od_log(&instance->logger, context, client, server,
"server disconnected, close connection and retry attach");
od_router_close(client);
server = NULL;
continue;
}
od_debug(&instance->logger, context, client, server,
"attached to %s%.*s",
server->id.id_prefix, sizeof(server->id.id),
server->id.id);
break;
}
/* connect to server, if necessary */
int rc;
@ -765,6 +777,7 @@ od_frontend_remote(od_client_t *client)
fe_rc = od_frontend_remote_client(client);
if (fe_rc != OD_FE_OK)
return fe_rc;
assert(client->server != NULL);
io_count = 2;
io_set[1] = client->server->io;
continue;