kapitan/IXWebSocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ws send / detect disconnection earlier

Browse Source
This commit is contained in:
Benjamin Sergeant 2020-01-09 13:30:08 -08:00
parent 39f69bd2b6
commit 27287aea50
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ws/ws_broadcast_server.cpp
View File

@ -72,7 +72,7 @@ namespace ix
size_t bufferedAmount = client->bufferedAmount(); size_t bufferedAmount = client->bufferedAmount();
spdlog::info("{} bytes left to be sent", bufferedAmount); spdlog::info("{} bytes left to be sent", bufferedAmount);
std::chrono::duration<double, std::milli> duration(10); std::chrono::duration<double, std::milli> duration(500);
std::this_thread::sleep_for(duration); std::this_thread::sleep_for(duration);
} while (client->bufferedAmount() != 0); } while (client->bufferedAmount() != 0);
} }

12
ws/ws_send.cpp
View File

@ -258,7 +258,7 @@ namespace ix
MsgPack msg(pdu); MsgPack msg(pdu);
Bench bench("Sending file through websocket"); Bench bench("Sending file through websocket");
auto result = _webSocket.sendBinary(msg.dump(), [throttle](int current, int total) -> bool { auto result = _webSocket.sendBinary(msg.dump(), [this, throttle](int current, int total) -> bool {
spdlog::info("ws_send: Step {} out of {}", current + 1, total); spdlog::info("ws_send: Step {} out of {}", current + 1, total);
if (throttle) if (throttle)
@ -267,7 +267,7 @@ namespace ix
std::this_thread::sleep_for(duration); std::this_thread::sleep_for(duration);
} }
return true; return _connected;
}); });
if (!result.success) if (!result.success)
@ -276,12 +276,18 @@ namespace ix
return false; return false;
} }
if (!_connected)
{
spdlog::error("ws_send: Got disconnected from the server");
return false;
}
do do
{ {
size_t bufferedAmount = _webSocket.bufferedAmount(); size_t bufferedAmount = _webSocket.bufferedAmount();
spdlog::info("ws_send: {} bytes left to be sent", bufferedAmount); spdlog::info("ws_send: {} bytes left to be sent", bufferedAmount);
std::chrono::duration<double, std::milli> duration(10); std::chrono::duration<double, std::milli> duration(500);
std::this_thread::sleep_for(duration); std::this_thread::sleep_for(duration);
} while (_webSocket.bufferedAmount() != 0 && _connected); } while (_webSocket.bufferedAmount() != 0 && _connected);