w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-25 05:38:46 -05:00
Code Issues Packages Projects Releases Wiki Activity

Per channel severity filter for default logging

Browse Source
This commit is contained in:
Bill Somerville 2020-09-26 15:15:47 +01:00
parent 030c8868ab
commit 1b941af851
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
WSJTXLogging.cpp
View File

@ -1,5 +1,6 @@
#include "WSJTXLogging.hpp" #include "WSJTXLogging.hpp"
#include <string>
#include <exception> #include <exception>
#include <sstream> #include <sstream>
@ -11,6 +12,7 @@
#include <boost/log/sinks/debug_output_backend.hpp> #include <boost/log/sinks/debug_output_backend.hpp>
#include <boost/log/expressions.hpp> #include <boost/log/expressions.hpp>
#include <boost/log/expressions/formatters/date_time.hpp> #include <boost/log/expressions/formatters/date_time.hpp>
#include <boost/log/expressions/predicates/channel_severity_filter.hpp>
#include <boost/log/support/date_time.hpp> #include <boost/log/support/date_time.hpp>
#include <boost/date_time/posix_time/posix_time.hpp> #include <boost/date_time/posix_time/posix_time.hpp>
#include <boost/container/flat_map.hpp> #include <boost/container/flat_map.hpp>
@ -34,6 +36,9 @@ namespace sinks = logging::sinks;
namespace ptime = boost::posix_time; namespace ptime = boost::posix_time;
namespace container = boost::container; namespace container = boost::container;
BOOST_LOG_ATTRIBUTE_KEYWORD(severity, "Severity", trivial::severity_level)
BOOST_LOG_ATTRIBUTE_KEYWORD(channel, "Channel", std::wstring)
namespace namespace
{ {
// Top level exception handler that gets exceptions from filters and // Top level exception handler that gets exceptions from filters and
@ -141,10 +146,20 @@ WSJTXLogging::WSJTXLogging ()
) )
); );
sys_sink->locked_backend ()->scan_for_files (); sys_sink->locked_backend ()->scan_for_files ();
// Per channel severity level filter
using min_severity_filter = expr::channel_severity_filter_actor<std::wstring, trivial::severity_level>;
min_severity_filter min_severity = expr::channel_severity_filter (channel, severity);
min_severity[L"SYSLOG"] = trivial::trace;
min_severity[L"RIGCTRL"] = trivial::info;
min_severity[L"DATALOG"] = trivial::info;
sys_sink->set_filter (min_severity || severity >= trivial::fatal);
sys_sink->set_formatter sys_sink->set_formatter
( (
expr::stream expr::stream
<< "[" << expr::format_date_time<ptime::ptime> ("TimeStamp", "%Y-%m-%d %H:%M:%S.%f") << "[" << channel
<< "][" << expr::format_date_time<ptime::ptime> ("TimeStamp", "%Y-%m-%d %H:%M:%S.%f")
<< "][" << expr::format_date_time<ptime::time_duration> ("Uptime", "%O:%M:%S.%f") << "][" << expr::format_date_time<ptime::time_duration> ("Uptime", "%O:%M:%S.%f")
<< "][" << trivial::severity << "][" << trivial::severity
<< "] " << expr::message << "] " << expr::message