jyapayne/Simple-Web-Server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes #289: Client now also attempts to reconnect if writing request to server fails

Browse source
This commit is contained in:
eidheim 2020-02-03 10:39:51 +01:00
commit 02bcd02891
1 changed files with 27 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

47
client_http.hpp
View file

@ -559,8 +559,12 @@ namespace SimpleWeb {
return;
if(!ec)
this->read(session);
else
session->callback(ec);
else {
if(session->connection->attempt_reconnect && ec != error::operation_aborted)
reconnect(session, ec);
else
session->callback(ec);
}
});
}
@ -620,30 +624,33 @@ namespace SimpleWeb {
session->callback(ec);
}
else {
if(session->connection->attempt_reconnect && ec != error::operation_aborted) {
LockGuard lock(connections_mutex);
auto it = connections.find(session->connection);
if(it != connections.end()) {
connections.erase(it);
session->connection = create_connection();
session->connection->attempt_reconnect = false;
session->connection->in_use = true;
session->response = std::shared_ptr<Response>(new Response(this->config.max_response_streambuf_size, session->connection));
connections.emplace(session->connection);
lock.unlock();
this->connect(session);
}
else {
lock.unlock();
session->callback(ec);
}
}
if(session->connection->attempt_reconnect && ec != error::operation_aborted)
reconnect(session, ec);
else
session->callback(ec);
}
});
}
void reconnect(const std::shared_ptr<Session> &session, const error_code &ec) {
LockGuard lock(connections_mutex);
auto it = connections.find(session->connection);
if(it != connections.end()) {
connections.erase(it);
session->connection = create_connection();
session->connection->attempt_reconnect = false;
session->connection->in_use = true;
session->response = std::shared_ptr<Response>(new Response(this->config.max_response_streambuf_size, session->connection));
connections.emplace(session->connection);
lock.unlock();
this->connect(session);
}
else {
lock.unlock();
session->callback(ec);
}
}
void read_content(const std::shared_ptr<Session> &session, std::size_t remaining_length) {
session->connection->set_timeout();
asio::async_read(*session->connection->socket, session->response->streambuf, asio::transfer_exactly(remaining_length), [this, session, remaining_length](const error_code &ec, std::size_t bytes_transferred) {