napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libcalamares: massage logging

Browse Source 
Make the log-to-file always follow columns (with time
at the start of each line) so that stdout and the
log file look more alike.
This commit is contained in:
Adriaan de Groot 2023-11-07 00:41:46 +01:00
parent cdd50681cd
commit b57db97412
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/libcalamares/utils/Logger.cpp
View File

@ -83,7 +83,7 @@ log_enabled( unsigned int level )
}
static void
log_implementation( const char* msg, unsigned int debugLevel, const bool withTime )
log_implementation( const char* msg, unsigned int debugLevel, const char* funcinfo )
{
Calamares::MutexLocker lock( &s_mutex );
@ -93,15 +93,20 @@ log_implementation( const char* msg, unsigned int debugLevel, const bool withTim
// If we don't format the date as a Qt::ISODate then we get a crash when
// logging at exit as Qt tries to use QLocale to format, but QLocale is
// on its way out.
logfile << date.toUtf8().data() << " - " << time.toUtf8().data() << " [" << debugLevel << "]: " << msg << std::endl;
if ( funcinfo )
{
logfile << date.toUtf8().data() << " - " << time.toUtf8().data() << " [" << debugLevel << "]: " << funcinfo
<< '\n';
}
logfile << date.toUtf8().data() << " - " << time.toUtf8().data() << " [" << debugLevel << (funcinfo ? "]: " : "]: ") << msg << '\n';
logfile.flush();
if ( logLevelEnabled( debugLevel ) )
{
if ( withTime )
if ( funcinfo )
{
std::cout << time.toUtf8().data() << " [" << debugLevel << "]: ";
std::cout << time.toUtf8().data() << " [" << debugLevel << "]: " << funcinfo << s_Continuation;
}
// The endl is desired, since it also flushes (like the logfile, above)
std::cout << msg << std::endl;
@ -134,7 +139,7 @@ CalamaresLogHandler( QtMsgType type, const QMessageLogContext&, const QString& m
return;
}
log_implementation( msg.toUtf8().constData(), level, true );
log_implementation( msg.toUtf8().constData(), level, nullptr );
}
QString
@ -202,12 +207,7 @@ CDebug::~CDebug()
{
if ( log_enabled( m_debugLevel ) )
{
if ( m_funcinfo )
{
m_msg.prepend( s_Continuation ); // Prepending, so back-to-front
m_msg.prepend( m_funcinfo );
}
log_implementation( m_msg.toUtf8().data(), m_debugLevel, bool( m_funcinfo ) );
log_implementation( m_msg.toUtf8().data(), m_debugLevel, m_funcinfo );
}
}