diff options
author | Gabriel Russell <gabriel.russell@mongodb.com> | 2020-02-20 16:05:48 -0500 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-02-21 20:12:44 +0000 |
commit | 0f7625b5cdbc24ed0fce1e168059118cb025d869 (patch) | |
tree | 3ea90b71ed2510e220140626b351f6e998d2d8b7 /src/mongo/crypto | |
parent | 3463ea25afcbf2c07b96f043904961b5c0f04474 (diff) | |
download | mongo-0f7625b5cdbc24ed0fce1e168059118cb025d869.tar.gz |
SERVER-45567 removing util/log.h where I can
o converting some log lines that were missed
o fixing some missing includes
create mode 100644 src/mongo/transport/ismaster_metrics.cpp
Diffstat (limited to 'src/mongo/crypto')
-rw-r--r-- | src/mongo/crypto/mechanism_scram_test.cpp | 1 | ||||
-rw-r--r-- | src/mongo/crypto/symmetric_crypto.cpp | 1 | ||||
-rw-r--r-- | src/mongo/crypto/symmetric_crypto_openssl.cpp | 1 | ||||
-rw-r--r-- | src/mongo/crypto/symmetric_crypto_windows.cpp | 2 | ||||
-rw-r--r-- | src/mongo/crypto/symmetric_key.cpp | 6 |
5 files changed, 5 insertions, 6 deletions
diff --git a/src/mongo/crypto/mechanism_scram_test.cpp b/src/mongo/crypto/mechanism_scram_test.cpp index 8d5ea962429..9c5efba8d54 100644 --- a/src/mongo/crypto/mechanism_scram_test.cpp +++ b/src/mongo/crypto/mechanism_scram_test.cpp @@ -35,7 +35,6 @@ #include "mongo/crypto/sha1_block.h" #include "mongo/crypto/sha256_block.h" #include "mongo/unittest/unittest.h" -#include "mongo/util/log.h" namespace mongo { namespace scram { diff --git a/src/mongo/crypto/symmetric_crypto.cpp b/src/mongo/crypto/symmetric_crypto.cpp index 0a6bbc2e916..81a7603f3e8 100644 --- a/src/mongo/crypto/symmetric_crypto.cpp +++ b/src/mongo/crypto/symmetric_crypto.cpp @@ -41,7 +41,6 @@ #include "mongo/crypto/symmetric_key.h" #include "mongo/platform/random.h" #include "mongo/util/assert_util.h" -#include "mongo/util/log.h" #include "mongo/util/net/ssl_manager.h" #include "mongo/util/str.h" diff --git a/src/mongo/crypto/symmetric_crypto_openssl.cpp b/src/mongo/crypto/symmetric_crypto_openssl.cpp index 4e661b98bbd..a0c52f9954e 100644 --- a/src/mongo/crypto/symmetric_crypto_openssl.cpp +++ b/src/mongo/crypto/symmetric_crypto_openssl.cpp @@ -42,7 +42,6 @@ #include "mongo/crypto/symmetric_key.h" #include "mongo/platform/random.h" #include "mongo/util/assert_util.h" -#include "mongo/util/log.h" #include "mongo/util/net/ssl_manager.h" #include "mongo/util/str.h" diff --git a/src/mongo/crypto/symmetric_crypto_windows.cpp b/src/mongo/crypto/symmetric_crypto_windows.cpp index 25dd5f304b8..5335e5d8f10 100644 --- a/src/mongo/crypto/symmetric_crypto_windows.cpp +++ b/src/mongo/crypto/symmetric_crypto_windows.cpp @@ -40,7 +40,7 @@ #include "mongo/crypto/symmetric_key.h" #include "mongo/platform/shared_library.h" #include "mongo/util/assert_util.h" -#include "mongo/util/log.h" +#include "mongo/util/errno_util.h" #include "mongo/util/str.h" namespace mongo { diff --git a/src/mongo/crypto/symmetric_key.cpp b/src/mongo/crypto/symmetric_key.cpp index a2bf2526bea..7626d83e8b1 100644 --- a/src/mongo/crypto/symmetric_key.cpp +++ b/src/mongo/crypto/symmetric_key.cpp @@ -36,7 +36,7 @@ #include <cstring> #include "mongo/crypto/symmetric_crypto.h" -#include "mongo/util/log.h" +#include "mongo/logv2/log.h" #include "mongo/util/secure_zero_memory.h" #include "mongo/util/str.h" @@ -66,7 +66,9 @@ SymmetricKey::SymmetricKey(const uint8_t* key, _initializationCount(initializationCount), _invocationCount(0) { if (_keySize < crypto::minKeySize || _keySize > crypto::maxKeySize) { - error() << "Attempt to construct symmetric key of invalid size: " << _keySize; + LOGV2_ERROR(23866, + "Attempt to construct symmetric key of invalid size: {keySize}", + "keySize"_attr = _keySize); return; } } |