WindyMadman/seafile
1
0
Fork 0
mirror of https://github.com/haiwen/seafile.git synced 2025-01-09 04:17:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

[client] Don't timeout block-tx-client if the connection was closed.

Browse Source
This commit is contained in:
Jiaqiang Xu 2015-01-08 13:36:38 +08:00
parent 879dc05a98
commit 36f94b985f
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
daemon/block-tx-client.c
View File

@ -920,10 +920,15 @@ client_thread_loop (BlockTxClient *client)
} else
max_fd = info->cmd_pipe[0];
tmo.tv_sec = RECV_TIMEOUT_SEC;
tmo.tv_usec = 0;
/* If the client is already shutdown, no need to add timeout. */
if (client->recv_state != RECV_STATE_DONE) {
tmo.tv_sec = RECV_TIMEOUT_SEC;
tmo.tv_usec = 0;
rc = select (max_fd + 1, &fds, NULL, NULL, &tmo);
} else {
rc = select (max_fd + 1, &fds, NULL, NULL, NULL);
}
rc = select (max_fd + 1, &fds, NULL, NULL, &tmo);
if (rc < 0 && errno == EINTR) {
continue;
} else if (rc < 0) {