applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-07-01 19:35:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[libcalamares] Log to file and stdout consistently

Browse source 
- The log **file** got every QDebug object, while stdout only
  got the ones of sufficient logging level. A CDebug object checks the
  logging level before writing anything -- so those already were
  consistent, but any qDebug() in the program (not cDebug()!) would
  reach the writing-function anyway, and so log to the file.
  Fix this weird inconsistency by checking log-level just once,
  for both writes.
This commit is contained in:
Adriaan de Groot 2021-05-31 11:39:13 +02:00
parent 716328cafb
commit b68e535131
1 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/libcalamares/utils/Logger.cpp
View file

@ -69,7 +69,7 @@ logLevel()
static void
log( const char* msg, unsigned int debugLevel, bool withTime = true )
{
if ( true )
if ( logLevelEnabled( debugLevel ) )
{
QMutexLocker lock( &s_mutex );
@ -81,11 +81,7 @@ log( const char* msg, unsigned int debugLevel, bool withTime = true )
<< QString::number( debugLevel ).toUtf8().data() << "]: " << msg << std::endl;
logfile.flush();
}
if ( logLevelEnabled( debugLevel ) )
{
QMutexLocker lock( &s_mutex );
if ( withTime )
{
std::cout << QTime::currentTime().toString().toUtf8().data() << " ["