w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2026-06-11 02:09:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Another approach to track down a segmentation fault"

Browse Source 
This reverts commit 403528e436.
This commit is contained in:
Bill Somerville
2020-11-13 22:23:58 +00:00
parent 403528e436
commit 8c5e362830
3 changed files with 108 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WSJTXLogging.cpp
+49 -49
View File
@@ -192,53 +192,53 @@ WSJTXLogging::~WSJTXLogging ()
lg->remove_all_sinks ();
}
// // 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';
// 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)
// {
// case QtDebugMsg: severity = trivial::debug; break;
// case QtInfoMsg: severity = trivial::info; break;
// case QtWarningMsg: severity = trivial::warning; break;
// case QtCriticalMsg: severity = trivial::error; break;
// case QtFatalMsg: severity = trivial::fatal; break;
// }
// // Map non-default Qt categories to logger channels, Qt logger
// // context is mapped to the appropriate logger attributes.
// auto log = sys::get ();
// std::string file;
// std::string function;
// if (context.file)
// {
// file = context.file;
// }
// if (context.function)
// {
// function = context.function;
// }
// 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)
// << 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)
// << msg.toStdString ();
// }
// if (QtFatalMsg == type)
// {
// // bail out
// throw std::runtime_error {"Fatal Qt Error"};
// }
// }
// Convert Qt message types to logger severities
auto severity = trivial::trace;
switch (type)
{
case QtDebugMsg: severity = trivial::debug; break;
case QtInfoMsg: severity = trivial::info; break;
case QtWarningMsg: severity = trivial::warning; break;
case QtCriticalMsg: severity = trivial::error; break;
case QtFatalMsg: severity = trivial::fatal; break;
}
// Map non-default Qt categories to logger channels, Qt logger
// context is mapped to the appropriate logger attributes.
auto log = sys::get ();
std::string file;
std::string function;
if (context.file)
{
file = context.file;
}
if (context.function)
{
function = context.function;
}
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)
<< 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)
<< msg.toStdString ();
}
if (QtFatalMsg == type)
{
// bail out
throw std::runtime_error {"Fatal Qt Error"};
}
}