Skip to content

Commit

Permalink
OrcCommand: UtilitiesLogger: use enum class Level
Browse files Browse the repository at this point in the history
  • Loading branch information
@fabienfl-orc
fabienfl-orc committed Feb 10, 2021
1 parent 6b90c5d commit 46aaa4e
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 25 deletions.
26 changes: 13 additions & 13 deletions src/OrcCommand/Log/UtilitiesLogger.cpp
View file
Expand Up @@ -42,15 +42,15 @@ std::unique_ptr<SpdlogLogger> CreateSpdlogLogger(const std::string& name)
});

// Default upstream log level filter (sinks will not received filtered logs)
logger->SetLevel(spdlog::level::debug);
logger->SetLevel(Log::Level::Debug);

return logger;
}

std::shared_ptr<Command::UtilitiesLogger::ConsoleSink> CreateConsoleSink()
{
auto sink = std::make_shared<Command::UtilitiesLogger::ConsoleSink>();
sink->SetLevel(spdlog::level::critical);
sink->SetLevel(Log::Level::Critical);
return sink;
}

Expand All @@ -59,7 +59,7 @@ std::shared_ptr<Command::UtilitiesLogger::FileSink> CreateFileSink()
auto sink = std::make_shared<Command::UtilitiesLogger::FileSink>();

// Allow all logs to be print, they will be filtered by the upstream level set by spdlog::set_level
sink->SetLevel(spdlog::level::trace);
sink->SetLevel(Log::Level::Trace);
return sink;
}

Expand All @@ -84,7 +84,7 @@ std::pair<SpdlogLogger::Ptr, SpdlogLogger::Ptr> CreateFacilities(SpdlogSink::Ptr

} // namespace

Orc::Command::UtilitiesLogger::UtilitiesLogger()
UtilitiesLogger::UtilitiesLogger()
{
m_fileSink = ::CreateFileSink();
m_consoleSink = ::CreateConsoleSink();
Expand All @@ -99,7 +99,7 @@ Orc::Command::UtilitiesLogger::UtilitiesLogger()
Orc::Log::SetDefaultLogger(m_logger);
}

Orc::Command::UtilitiesLogger::~UtilitiesLogger()
UtilitiesLogger::~UtilitiesLogger()
{
Orc::Log::SetDefaultLogger(nullptr);
}
Expand All @@ -110,7 +110,7 @@ void Orc::Command::UtilitiesLogger::Configure(int argc, const wchar_t* argv[]) c
{
HRESULT hr = E_FAIL;
bool verbose = false;
std::optional<spdlog::level::level_enum> level;
std::optional<Log::Level> level;

for (int i = 0; i < argc; i++)
{
Expand All @@ -125,32 +125,32 @@ void Orc::Command::UtilitiesLogger::Configure(int argc, const wchar_t* argv[]) c

if (!_wcsnicmp(argv[i] + 1, L"Critical", wcslen(L"Critical")))
{
level = spdlog::level::critical;
level = Log::Level::Critical;
verbose = true;
}
if (!_wcsnicmp(argv[i] + 1, L"Error", wcslen(L"Error")))
{
level = spdlog::level::err;
level = Log::Level::Error;
verbose = true;
}
else if (!_wcsnicmp(argv[i] + 1, L"Warn", wcslen(L"Warn")))
{
level = spdlog::level::warn;
level = Log::Level::Warning;
verbose = true;
}
else if (!_wcsnicmp(argv[i] + 1, L"Info", wcslen(L"Info")))
{
level = spdlog::level::info;
level = Log::Level::Info;
verbose = true;
}
else if (!_wcsnicmp(argv[i] + 1, L"Debug", wcslen(L"Debug")))
{
level = spdlog::level::debug;
level = Log::Level::Debug;
verbose = true;
}
else if (!_wcsnicmp(argv[i] + 1, L"Trace", wcslen(L"Trace")))
{
level = spdlog::level::trace;
level = Log::Level::Trace;
verbose = true;
}
else if (!_wcsnicmp(argv[i] + 1, L"NoConsole", wcslen(L"NoConsole")))
Expand Down Expand Up @@ -193,7 +193,7 @@ void Orc::Command::UtilitiesLogger::Configure(int argc, const wchar_t* argv[]) c
{
if (!level)
{
level = spdlog::level::debug;
level = Log::Level::Debug;
}

m_consoleSink->SetLevel(*level);
Expand Down
14 changes: 7 additions & 7 deletions src/OrcLib/Log/SpdlogLogger.cpp
View file
Expand Up @@ -26,14 +26,14 @@ void SpdlogLogger::Add(SpdlogSink::Ptr sink)
m_sinks.push_back(std::move(sink));
}

spdlog::level::level_enum SpdlogLogger::Level() const
Log::Level SpdlogLogger::Level() const
{
return m_logger->level();
return static_cast<Log::Level>(m_logger->level());
}

void SpdlogLogger::SetLevel(spdlog::level::level_enum level)
void SpdlogLogger::SetLevel(Log::Level level)
{
m_logger->set_level(level);
m_logger->set_level(static_cast<spdlog::level::level_enum>(level));
}

void SpdlogLogger::EnableBacktrace(size_t messageCount)
Expand All @@ -49,12 +49,12 @@ void SpdlogLogger::DisableBacktrace()
void SpdlogLogger::DumpBacktrace()
{
// Backup log settings
const auto loggerLevel = m_logger->level();
const auto loggerLevel = static_cast<Log::Level>(m_logger->level());
m_logger->set_level(spdlog::level::trace);

struct SinkSettings
{
spdlog::level::level_enum level;
Log::Level level;
std::unique_ptr<spdlog::formatter> formatter;
};

Expand All @@ -63,7 +63,7 @@ void SpdlogLogger::DumpBacktrace()
{
sinksSettings[i] = {m_sinks[i]->Level(), m_sinks[i]->CloneFormatter()};

m_sinks[i]->SetLevel(spdlog::level::trace);
m_sinks[i]->SetLevel(Log::Level::Trace);
m_sinks[i]->SetFormatter(m_backtraceFormatter->clone());
}

Expand Down
4 changes: 2 additions & 2 deletions src/OrcLib/Log/SpdlogLogger.h
View file
Expand Up @@ -31,8 +31,8 @@ class SpdlogLogger

void Add(SpdlogSink::Ptr sink);

spdlog::level::level_enum Level() const;
void SetLevel(spdlog::level::level_enum level);
Log::Level Level() const;
void SetLevel(Log::Level level);

void SetPattern(const std::string& pattern);
void SetFormatter(std::unique_ptr<spdlog::formatter> formatter);
Expand Down
6 changes: 4 additions & 2 deletions src/OrcLib/Log/SpdlogSink.h
View file
Expand Up @@ -12,6 +12,8 @@

#include <spdlog/sinks/sink.h>

#include "Log/Level.h"

namespace Orc {
namespace Log {

Expand All @@ -29,8 +31,8 @@ class SpdlogSink

void AddTo(spdlog::logger& logger) { logger.sinks().push_back(m_sink); }

spdlog::level::level_enum Level() const { return m_sink->level(); }
void SetLevel(spdlog::level::level_enum level) { m_sink->set_level(level); }
Log::Level Level() const { return static_cast<Log::Level>(m_sink->level()); }
void SetLevel(Log::Level level) { m_sink->set_level(static_cast<spdlog::level::level_enum>(level)); }

std::unique_ptr<spdlog::formatter> CloneFormatter() const
{
Expand Down
2 changes: 1 addition & 1 deletion src/OrcLib/Privilege.cpp
View file
Expand Up @@ -143,7 +143,7 @@ HRESULT Orc::GetMyCurrentSID(PSID& pSid)
return hr;
}

if (Log::DefaultLogger()->Get(Logger::Facility::kDefault)->Level() == spdlog::level::debug)
if (Log::DefaultLogger()->Get(Logger::Facility::kDefault)->Level() == Log::Level::Debug)
{
LPWSTR pszSid = nullptr;
if (!ConvertSidToStringSid(pSid, &pszSid))
Expand Down

0 comments on commit 46aaa4e

Please sign in to comment.