diff options
| author | Gregory Noma <gregory.noma@gmail.com> | 2018-06-07 16:30:07 -0400 |
|---|---|---|
| committer | Gregory Noma <gregory.noma@gmail.com> | 2018-07-05 10:07:46 -0400 |
| commit | 96628864b50e4d0377dd920eef647e46c5bc5db8 (patch) | |
| tree | 36eb7c7133a1464e28d57bad7cc0e0fce4971ec5 /src/mongo/transport | |
| parent | 711c076ef57c0ce3517ab9385c2fd3a005c941b3 (diff) | |
| download | mongo-96628864b50e4d0377dd920eef647e46c5bc5db8.tar.gz | |
SERVER-29917 Alias server options starting with 'ssl' to parameters starting with 'tls'
Add support for deprecated single names. All 'ssl' options are now
deprecated, superceded by their 'tls' counterparts. Add tests for
these options in server_options_test. Re-add functionality of
disableNonSSLConnectionLogging.
Diffstat (limited to 'src/mongo/transport')
| -rw-r--r-- | src/mongo/transport/session_asio.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mongo/transport/session_asio.h b/src/mongo/transport/session_asio.h index f9fac4276a0..d1c2bd865eb 100644 --- a/src/mongo/transport/session_asio.h +++ b/src/mongo/transport/session_asio.h @@ -640,7 +640,8 @@ private: uasserted(ErrorCodes::SSLHandshakeFailed, "The server is configured to only allow SSL connections"); } else { - if (_tl->_sslMode() == SSLParams::SSLMode_preferSSL) { + if (!sslGlobalParams.disableNonSSLConnectionLogging && + _tl->_sslMode() == SSLParams::SSLMode_preferSSL) { LOG(0) << "SSL mode is set to 'preferred' and connection " << id() << " to " << remote() << " is not using SSL."; } |