maxmustermann/PowerToys
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[Bootstrapper] improve logging (#9765)

Browse source
This commit is contained in:
Andrey Nekrasov 2021-02-18 09:54:24 +03:00 committed by GitHub
parent ee45c39d65
commit 5e75c0fc6e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
installer/PowerToysBootstrapper/bootstrapper/bootstrapper.cpp
View file

@ -19,7 +19,6 @@
auto Strings = create_notifications_strings(); auto Strings = create_notifications_strings();
static bool g_Silent = false; static bool g_Silent = false;
static bool g_LoggerEnabled = false;
#define STR_HELPER(x) #x #define STR_HELPER(x) #x
#define STR(x) STR_HELPER(x) #define STR(x) STR_HELPER(x)
@ -50,9 +49,10 @@ std::optional<fs::path> ExtractEmbeddedInstaller(const fs::path extractPath)
void SetupLogger(fs::path directory, const spdlog::level::level_enum severity) void SetupLogger(fs::path directory, const spdlog::level::level_enum severity)
{ {
std::shared_ptr<spdlog::logger> logger;
auto nullLogger = spdlog::null_logger_mt("null");
try try
{ {
std::shared_ptr<spdlog::logger> logger;
if (severity != spdlog::level::off) if (severity != spdlog::level::off)
{ {
logger = spdlog::basic_logger_mt("file", (directory / EXE_LOG_FILENAME).wstring()); logger = spdlog::basic_logger_mt("file", (directory / EXE_LOG_FILENAME).wstring());
@ -64,7 +64,7 @@ void SetupLogger(fs::path directory, const spdlog::level::level_enum severity)
} }
else else
{ {
logger = spdlog::null_logger_mt("null"); logger = nullLogger;
} }
logger->set_pattern("[%L][%d-%m-%C-%T] %v"); logger->set_pattern("[%L][%d-%m-%C-%T] %v");
@ -72,10 +72,10 @@ void SetupLogger(fs::path directory, const spdlog::level::level_enum severity)
spdlog::set_default_logger(std::move(logger)); spdlog::set_default_logger(std::move(logger));
spdlog::set_level(severity); spdlog::set_level(severity);
spdlog::flush_every(std::chrono::seconds(5)); spdlog::flush_every(std::chrono::seconds(5));
g_LoggerEnabled = true;
} }
catch (...) catch (...)
{ {
spdlog::set_default_logger(nullLogger);
} }
} }
@ -418,10 +418,7 @@ int WINAPI WinMain(HINSTANCE hi, HINSTANCE, LPSTR, int)
std::string messageA{ "Unhandled std exception encountered\n" }; std::string messageA{ "Unhandled std exception encountered\n" };
messageA.append(ex.what()); messageA.append(ex.what());
if (g_LoggerEnabled)
{
spdlog::error(messageA.c_str()); spdlog::error(messageA.c_str());
}
std::wstring messageW{}; std::wstring messageW{};
std::copy(messageA.begin(), messageA.end(), messageW.begin()); std::copy(messageA.begin(), messageA.end(), messageW.begin());
@ -432,10 +429,7 @@ int WINAPI WinMain(HINSTANCE hi, HINSTANCE, LPSTR, int)
std::wstring message{ L"Unhandled winrt exception encountered\n" }; std::wstring message{ L"Unhandled winrt exception encountered\n" };
message.append(ex.message().c_str()); message.append(ex.message().c_str());
if (g_LoggerEnabled) spdlog::error(message.c_str());
{
spdlog::error(message.c_str());
}
ShowMessageBoxError(message.c_str()); ShowMessageBoxError(message.c_str());
} }
@ -445,10 +439,7 @@ int WINAPI WinMain(HINSTANCE hi, HINSTANCE, LPSTR, int)
std::wstring message{ L"Unknown exception encountered\n" }; std::wstring message{ L"Unknown exception encountered\n" };
message.append(lastErrorMessage ? std::move(*lastErrorMessage) : L""); message.append(lastErrorMessage ? std::move(*lastErrorMessage) : L"");
if (g_LoggerEnabled) spdlog::error(message.c_str());
{
spdlog::error(message.c_str());
}
ShowMessageBoxError(message.c_str()); ShowMessageBoxError(message.c_str());
} }