gitMirror/spdlog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup win_eventlog_sink

Browse Source
This commit is contained in:
bandana2004 2020-02-09 18:12:54 +02:00
parent 2435f46d06
commit d8701890b2
1 changed files with 10 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
include/spdlog/sinks/win_eventlog_sink.h
View File

@ -60,27 +60,6 @@ struct utils
{ {
report(message.c_str()); report(message.c_str());
} }
/** Runs a func and reports an exception to stderr if any */
template <typename Result>
static Result report_exceptions(std::function<Result()> func, Result defaultValue)
{
try
{
return func();
}
catch (std::exception const& e)
{
report(e.what());
return defaultValue;
}
}
/** Runs a func and reports an exception to stderr if any */
static void report_exceptions(std::function<void()> func)
{
report_exceptions<int>([&func] () { func(); return 0; }, 0);
}
}; };
/** Windows error */ /** Windows error */
@ -279,20 +258,22 @@ public:
: source_(source) : source_(source)
{ {
using namespace internal; using namespace internal;
try
utils::report_exceptions([this] () { {
current_user_sid_ = sid_t::get_current_user_sid(); current_user_sid_ = sid_t::get_current_user_sid();
}); }
catch (std::exception const& e)
{
utils::report(e.what());
}
} }
~win_eventlog_sink() ~win_eventlog_sink()
{ {
using namespace internal; using namespace internal;
utils::report_exceptions([this]()
{ if (hEventLog_ && !DeregisterEventSource(hEventLog_))
if (hEventLog_ && !DeregisterEventSource(hEventLog_)) utils::report(win32_error::format("DeregisterEventSource"));
utils::report(win32_error::format("DeregisterEventSource"));
});
} }
/** /**