diff options
author | Gabriel Russell <gabriel.russell@mongodb.com> | 2020-02-20 12:23:12 -0500 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-02-20 21:25:37 +0000 |
commit | c7f41ef10eefdd8abb5a671a0046f55af310705c (patch) | |
tree | af697623e733b153d3d190f8f1fc90fccb3f54c2 /src/mongo/util/processinfo_windows.cpp | |
parent | 11bfeda8152267fa95bc63b4e93723845737217f (diff) | |
download | mongo-c7f41ef10eefdd8abb5a671a0046f55af310705c.tar.gz |
SERVER-45869 more automatically converted structured
Diffstat (limited to 'src/mongo/util/processinfo_windows.cpp')
-rw-r--r-- | src/mongo/util/processinfo_windows.cpp | 43 |
1 files changed, 31 insertions, 12 deletions
diff --git a/src/mongo/util/processinfo_windows.cpp b/src/mongo/util/processinfo_windows.cpp index c8bdb2b633a..dd73eb49f81 100644 --- a/src/mongo/util/processinfo_windows.cpp +++ b/src/mongo/util/processinfo_windows.cpp @@ -37,6 +37,7 @@ #include <iostream> #include <psapi.h> +#include "mongo/logv2/log.h" #include "mongo/util/log.h" #include "mongo/util/processinfo.h" @@ -72,7 +73,9 @@ int ProcessInfo::getVirtualMemorySize() { BOOL status = GlobalMemoryStatusEx(&mse); if (!status) { DWORD gle = GetLastError(); - error() << "GlobalMemoryStatusEx failed with " << errnoWithDescription(gle); + LOGV2_ERROR(23812, + "GlobalMemoryStatusEx failed with {errnoWithDescription_gle}", + "errnoWithDescription_gle"_attr = errnoWithDescription(gle)); fassert(28621, status); } @@ -86,7 +89,9 @@ int ProcessInfo::getResidentSize() { BOOL status = GetProcessMemoryInfo(GetCurrentProcess(), &pmc, sizeof(pmc)); if (!status) { DWORD gle = GetLastError(); - error() << "GetProcessMemoryInfo failed with " << errnoWithDescription(gle); + LOGV2_ERROR(23813, + "GetProcessMemoryInfo failed with {errnoWithDescription_gle}", + "errnoWithDescription_gle"_attr = errnoWithDescription(gle)); fassert(28622, status); } @@ -99,7 +104,9 @@ double ProcessInfo::getSystemMemoryPressurePercentage() { BOOL status = GlobalMemoryStatusEx(&mse); if (!status) { DWORD gle = GetLastError(); - error() << "GlobalMemoryStatusEx failed with " << errnoWithDescription(gle); + LOGV2_ERROR(23814, + "GlobalMemoryStatusEx failed with {errnoWithDescription_gle}", + "errnoWithDescription_gle"_attr = errnoWithDescription(gle)); fassert(28623, status); } @@ -155,16 +162,22 @@ bool getFileVersion(const char* filePath, DWORD& fileVersionMS, DWORD& fileVersi DWORD verSize = GetFileVersionInfoSizeA(filePath, NULL); if (verSize == 0) { DWORD gle = GetLastError(); - warning() << "GetFileVersionInfoSizeA on " << filePath << " failed with " - << errnoWithDescription(gle); + LOGV2_WARNING( + 23807, + "GetFileVersionInfoSizeA on {filePath} failed with {errnoWithDescription_gle}", + "filePath"_attr = filePath, + "errnoWithDescription_gle"_attr = errnoWithDescription(gle)); return false; } std::unique_ptr<char[]> verData(new char[verSize]); if (GetFileVersionInfoA(filePath, NULL, verSize, verData.get()) == 0) { DWORD gle = GetLastError(); - warning() << "GetFileVersionInfoSizeA on " << filePath << " failed with " - << errnoWithDescription(gle); + LOGV2_WARNING( + 23808, + "GetFileVersionInfoSizeA on {filePath} failed with {errnoWithDescription_gle}", + "filePath"_attr = filePath, + "errnoWithDescription_gle"_attr = errnoWithDescription(gle)); return false; } @@ -172,13 +185,17 @@ bool getFileVersion(const char* filePath, DWORD& fileVersionMS, DWORD& fileVersi VS_FIXEDFILEINFO* verInfo; if (VerQueryValueA(verData.get(), "\\", (LPVOID*)&verInfo, &size) == 0) { DWORD gle = GetLastError(); - warning() << "VerQueryValueA on " << filePath << " failed with " - << errnoWithDescription(gle); + LOGV2_WARNING(23809, + "VerQueryValueA on {filePath} failed with {errnoWithDescription_gle}", + "filePath"_attr = filePath, + "errnoWithDescription_gle"_attr = errnoWithDescription(gle)); return false; } if (size != sizeof(VS_FIXEDFILEINFO)) { - warning() << "VerQueryValueA on " << filePath << " returned structure with unexpected size"; + LOGV2_WARNING(23810, + "VerQueryValueA on {filePath} returned structure with unexpected size", + "filePath"_attr = filePath); return false; } @@ -310,8 +327,10 @@ bool ProcessInfo::checkNumaEnabled() { new BYTE[returnLength])); } else { DWORD gle = GetLastError(); - warning() << "GetLogicalProcessorInformation failed with " - << errnoWithDescription(gle); + LOGV2_WARNING( + 23811, + "GetLogicalProcessorInformation failed with {errnoWithDescription_gle}", + "errnoWithDescription_gle"_attr = errnoWithDescription(gle)); return false; } } |