From 47f85961aac705e3410e3b8eb619d1775812d47f Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Sat, 26 Sep 2020 15:44:58 +0100 Subject: [PATCH] Better mapping of Hamlib message severity to ours --- Transceiver/HamlibTransceiver.cpp | 6 +++--- WSJTXLogging.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Transceiver/HamlibTransceiver.cpp b/Transceiver/HamlibTransceiver.cpp index 20479fede..a2674a58f 100644 --- a/Transceiver/HamlibTransceiver.cpp +++ b/Transceiver/HamlibTransceiver.cpp @@ -137,11 +137,11 @@ int HamlibTransceiver::debug_callback (enum rig_debug_level_e level, rig_ptr_t a auto severity = boost::log::trivial::trace; switch (level) { - case RIG_DEBUG_BUG: severity = boost::log::trivial::debug; break; + case RIG_DEBUG_BUG: severity = boost::log::trivial::fatal; break; case RIG_DEBUG_ERR: severity = boost::log::trivial::error; break; case RIG_DEBUG_WARN: severity = boost::log::trivial::warning; break; - case RIG_DEBUG_TRACE: severity = boost::log::trivial::info; break; - case RIG_DEBUG_VERBOSE: severity = boost::log::trivial::trace; break; + case RIG_DEBUG_VERBOSE: severity = boost::log::trivial::debug; break; + case RIG_DEBUG_TRACE: severity = boost::log::trivial::trace; break; default: break; }; if (level != RIG_DEBUG_NONE) // no idea what level NONE means so diff --git a/WSJTXLogging.cpp b/WSJTXLogging.cpp index 6d81936d7..040705db4 100644 --- a/WSJTXLogging.cpp +++ b/WSJTXLogging.cpp @@ -150,7 +150,7 @@ WSJTXLogging::WSJTXLogging () // Per channel severity level filter using min_severity_filter = expr::channel_severity_filter_actor; min_severity_filter min_severity = expr::channel_severity_filter (channel, severity); - min_severity[L"SYSLOG"] = trivial::trace; + min_severity[L"SYSLOG"] = trivial::info; min_severity[L"RIGCTRL"] = trivial::info; min_severity[L"DATALOG"] = trivial::info; sys_sink->set_filter (min_severity || severity >= trivial::fatal);