Skip to content
Snippets Groups Projects
Commit b2d3ed74 authored by Nicolas Pope's avatar Nicolas Pope
Browse files

Try some reordering

parent 29862231
No related branches found
No related tags found
No related merge requests found
...@@ -215,12 +215,6 @@ void Peer::close(bool retry) { ...@@ -215,12 +215,6 @@ void Peer::close(bool retry) {
void Peer::_close(bool retry) { void Peer::_close(bool retry) {
if (status_ != NodeStatus::kConnected && status_ != NodeStatus::kConnecting) return; if (status_ != NodeStatus::kConnected && status_ != NodeStatus::kConnecting) return;
status_ = NodeStatus::kDisconnected;
if (sock_->is_valid()) {
net_->_notifyDisconnect(this);
sock_->close();
}
// Attempt auto reconnect? // Attempt auto reconnect?
if (retry && can_reconnect_) { if (retry && can_reconnect_) {
...@@ -229,6 +223,11 @@ void Peer::_close(bool retry) { ...@@ -229,6 +223,11 @@ void Peer::_close(bool retry) {
} else { } else {
status_ = NodeStatus::kDisconnected; status_ = NodeStatus::kDisconnected;
} }
if (sock_->is_valid()) {
net_->_notifyDisconnect(this);
sock_->close();
}
} }
bool Peer::socketError() { bool Peer::socketError() {
...@@ -238,8 +237,8 @@ bool Peer::socketError() { ...@@ -238,8 +237,8 @@ bool Peer::socketError() {
// Must close before log since log may try to send over net causing // Must close before log since log may try to send over net causing
// more socket errors... // more socket errors...
_close(reconnect_on_socket_error_);
net_->_notifyError(this, ftl::protocol::Error::kSocketError, uri_.to_string()); net_->_notifyError(this, ftl::protocol::Error::kSocketError, uri_.to_string());
_close(reconnect_on_socket_error_);
return true; return true;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment