diff options
| author | Jonathan Reams <jbreams@mongodb.com> | 2018-03-14 16:31:04 -0400 |
|---|---|---|
| committer | Jonathan Reams <jbreams@mongodb.com> | 2018-04-05 11:42:32 -0400 |
| commit | 1d50738b604a637f1f7d896a17131d8be7b2aa23 (patch) | |
| tree | 5da4c054ec84af129ac87f24331687fe8a51402b | |
| parent | 11fabe4f8295da18f68aae8a877c38a48c1b5133 (diff) | |
| download | mongo-1d50738b604a637f1f7d896a17131d8be7b2aa23.tar.gz | |
SERVER-32477 Fix logging and tests
| -rw-r--r-- | src/mongo/transport/session_asio.h | 2 | ||||
| -rw-r--r-- | src/mongo/transport/transport_layer_asio_integration_test.cpp | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/mongo/transport/session_asio.h b/src/mongo/transport/session_asio.h index 250969f6f5d..6128d1515d6 100644 --- a/src/mongo/transport/session_asio.h +++ b/src/mongo/transport/session_asio.h @@ -105,7 +105,7 @@ public: std::error_code ec; getSocket().cancel(); getSocket().shutdown(GenericSocket::shutdown_both, ec); - if (ec) { + if ((ec) && (ec != asio::error::not_connected)) { error() << "Error shutting down socket: " << ec.message(); } } diff --git a/src/mongo/transport/transport_layer_asio_integration_test.cpp b/src/mongo/transport/transport_layer_asio_integration_test.cpp index 0cfde5bf166..ff8b36fbfeb 100644 --- a/src/mongo/transport/transport_layer_asio_integration_test.cpp +++ b/src/mongo/transport/transport_layer_asio_integration_test.cpp @@ -69,7 +69,12 @@ TEST(TransportLayerASIO, HTTPRequestGetsHTTPError) { log() << "Received response: \"" << httpResp << "\""; ASSERT_TRUE(httpResp.startsWith("HTTP/1.0 200 OK")); + // Why oh why can't ASIO unify their error codes +#ifdef _WIN32 ASSERT_EQ(ec, asio::error::connection_reset); +#else + ASSERT_EQ(ec, asio::error::eof); +#endif } } // namespace |