eelke/pgLab
1
0
Fork 0
Code Issues 28 Pull requests Projects Releases 1 Packages Wiki Activity Actions

Improved way sockets are closed.

Browse source 
Not 100% sure this is allowed by boost::asio thought a code inspection suggest it does as it is ignoring the error it gets on close.
This commit is contained in:
eelke 2018-04-08 09:06:05 +02:00
parent 61645d44ac
commit 5e83094e6a
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
pglablib/ASyncDBConnection.cpp
View file

@ -40,6 +40,7 @@ void ASyncDBConnection::setupConnection(const ConnectionConfig &config)
// auto start = std::chrono::steady_clock::now(); // auto start = std::chrono::steady_clock::now();
if (ok && m_connection.status() != CONNECTION_BAD) { if (ok && m_connection.status() != CONNECTION_BAD) {
auto sock_handle = m_connection.socket(); auto sock_handle = m_connection.socket();
m_asioSock.assign(ip::tcp::v4(), sock_handle); m_asioSock.assign(ip::tcp::v4(), sock_handle);
m_asioSock.non_blocking(true); m_asioSock.non_blocking(true);
@ -99,7 +100,9 @@ void ASyncDBConnection::closeConnection()
m_canceller.cancel(nullptr); m_canceller.cancel(nullptr);
} }
if (m_state != State::NotConnected) { if (m_state != State::NotConnected) {
m_asioSock.close(); // Do not really want to close it before libpq is finished with it
// However explicitly is the destroctor doing the right thing?
//m_asioSock.close();
m_connection.close(); m_connection.close();
} }
doStateCallback(State::NotConnected); doStateCallback(State::NotConnected);