huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add and use GetEnvironmentVariableValue (#997)

This commit is contained in:
Pavel Krymets 2018-06-29 11:17:22 -07:00 committed by GitHub
parent f5f0988baf
commit dfed3d7563
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/AspNetCoreModuleV2/CommonLib/Environment.cpp
View File

@ -18,7 +18,7 @@ Environment::ExpandEnvironmentVariables(const std::wstring & str)
do do
{ {
expandedStr.resize(requestedSize); expandedStr.resize(requestedSize);
requestedSize = ExpandEnvironmentStringsW(str.c_str(), &expandedStr[0], requestedSize); requestedSize = ExpandEnvironmentStringsW(str.c_str(), expandedStr.data(), requestedSize);
if (requestedSize == 0) if (requestedSize == 0)
{ {
throw std::system_error(GetLastError(), std::system_category(), "ExpandEnvironmentVariables"); throw std::system_error(GetLastError(), std::system_category(), "ExpandEnvironmentVariables");
@ -30,3 +30,31 @@ Environment::ExpandEnvironmentVariables(const std::wstring & str)
return expandedStr; return expandedStr;
} }
std::optional<std::wstring>
Environment::GetEnvironmentVariableValue(const std::wstring & str)
{
DWORD requestedSize = GetEnvironmentVariableW(str.c_str(), nullptr, 0);
if (requestedSize == 0)
{
if (GetLastError() == ERROR_ENVVAR_NOT_FOUND)
{
return std::nullopt;
}
throw std::system_error(GetLastError(), std::system_category(), "GetEnvironmentVariableW");
}
std::wstring expandedStr;
do
{
expandedStr.resize(requestedSize);
requestedSize = GetEnvironmentVariableW(str.c_str(), expandedStr.data(), requestedSize);
if (requestedSize == 0)
{
throw std::system_error(GetLastError(), std::system_category(), "ExpandEnvironmentStringsW");
}
} while (expandedStr.size() != requestedSize + 1);
return expandedStr;
}

3
src/AspNetCoreModuleV2/CommonLib/Environment.h
View File

@ -4,6 +4,7 @@
#pragma once #pragma once
#include <string> #include <string>
#include <optional>
class Environment class Environment
{ {
@ -13,5 +14,7 @@ public:
static static
std::wstring ExpandEnvironmentVariables(const std::wstring & str); std::wstring ExpandEnvironmentVariables(const std::wstring & str);
static
std::optional<std::wstring> GetEnvironmentVariableValue(const std::wstring & str);
}; };

8
src/AspNetCoreModuleV2/CommonLib/debugutil.cpp
View File

@ -53,7 +53,7 @@ DebugInitialize()
try try
{ {
const auto value = std::stoi(Environment::ExpandEnvironmentVariables(L"%ASPNETCORE_MODULE_DEBUG%")); const auto value = std::stoi(Environment::GetEnvironmentVariableValue(L"ASPNETCORE_MODULE_DEBUG").value_or(L"0"));
if (value >= 1) DEBUG_FLAGS_VAR |= ASPNETCORE_DEBUG_FLAG_ERROR; if (value >= 1) DEBUG_FLAGS_VAR |= ASPNETCORE_DEBUG_FLAG_ERROR;
if (value >= 2) DEBUG_FLAGS_VAR |= ASPNETCORE_DEBUG_FLAG_WARNING; if (value >= 2) DEBUG_FLAGS_VAR |= ASPNETCORE_DEBUG_FLAG_WARNING;
@ -67,11 +67,11 @@ DebugInitialize()
try try
{ {
auto debugOutputFile = Environment::ExpandEnvironmentVariables(L"%ASPNETCORE_MODULE_DEBUG_FILE%"); const auto debugOutputFile = Environment::GetEnvironmentVariableValue(L"ASPNETCORE_MODULE_DEBUG_FILE");
if (!debugOutputFile.empty()) if (debugOutputFile.has_value())
{ {
g_logFile = CreateFileW(debugOutputFile.c_str(), g_logFile = CreateFileW(debugOutputFile.value().c_str(),
(GENERIC_READ | GENERIC_WRITE), (GENERIC_READ | GENERIC_WRITE),
(FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE), (FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE),
nullptr, nullptr,