Revert "backing out a smaller chunk of Boost::log functionality"

This reverts commit 5993b3c75a.
This commit is contained in:
Bill Somerville 2020-11-13 22:24:20 +00:00
parent 896d75eb27
commit 2989e7d189
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F

View File

@ -195,8 +195,6 @@ WSJTXLogging::~WSJTXLogging ()
// Reroute Qt messages to the system logger
void WSJTXLogging::qt_log_handler (QtMsgType type, QMessageLogContext const& context, QString const& msg)
{
std::cerr << "qt_log_handler: type: " << int(type) << " file: " << context.file << " line: " << context.line << " msg: " << msg.toStdString () << '\n';
// Convert Qt message types to logger severities
auto severity = trivial::trace;
switch (type)
@ -223,17 +221,17 @@ void WSJTXLogging::qt_log_handler (QtMsgType type, QMessageLogContext const& con
if (!context.category || !qstrcmp (context.category, "default"))
{
BOOST_LOG_SEV (log, severity)
// << boost::log::add_value ("Line", context.line)
// << boost::log::add_value ("File", file)
// << boost::log::add_value ("Function", function)
<< boost::log::add_value ("Line", context.line)
<< boost::log::add_value ("File", file)
<< boost::log::add_value ("Function", function)
<< msg.toStdString ();
}
else
{
BOOST_LOG_CHANNEL_SEV (log, std::string {context.category}, severity)
// << boost::log::add_value ("Line", context.line)
// << boost::log::add_value ("File", file)
// << boost::log::add_value ("Function", function)
<< boost::log::add_value ("Line", context.line)
<< boost::log::add_value ("File", file)
<< boost::log::add_value ("Function", function)
<< msg.toStdString ();
}
if (QtFatalMsg == type)