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

[libcalamares] Reduce log-spam in emergencies

Browse Source 
- when an emergency strikes, log the modules that are skipped
  with a Once, but if an emergency module runs, refresh that
  Once so that the function header is printed again -- to
  distinguish JobQueue debugging from the logging from the
  emergency module.
This commit is contained in:
Adriaan de Groot 2021-09-22 01:44:00 +02:00
parent 9be9431970
commit db26df311d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libcalamares/JobQueue.cpp
View File

@ -112,17 +112,19 @@ public:
QString message; ///< Filled in with errors QString message; ///< Filled in with errors
QString details; QString details;
Logger::Once o;
m_jobIndex = 0; m_jobIndex = 0;
for ( const auto& jobitem : *m_runningJobs ) for ( const auto& jobitem : *m_runningJobs )
{ {
if ( failureEncountered && !jobitem.job->isEmergency() ) if ( failureEncountered && !jobitem.job->isEmergency() )
{ {
cDebug() << "Skipping non-emergency job" << jobitem.job->prettyName(); cDebug() << o << "Skipping non-emergency job" << jobitem.job->prettyName();
} }
else else
{ {
cDebug() << "Starting" << ( failureEncountered ? "EMERGENCY JOB" : "job" ) << jobitem.job->prettyName() cDebug() << o << "Starting" << ( failureEncountered ? "EMERGENCY JOB" : "job" ) << jobitem.job->prettyName()
<< '(' << ( m_jobIndex + 1 ) << '/' << m_runningJobs->count() << ')'; << '(' << ( m_jobIndex + 1 ) << '/' << m_runningJobs->count() << ')';
o.refresh(); // So next time it shows the function header again
emitProgress( 0.0 ); // 0% for *this job* emitProgress( 0.0 ); // 0% for *this job*
connect( jobitem.job.data(), &Job::progress, this, &JobThread::emitProgress ); connect( jobitem.job.data(), &Job::progress, this, &JobThread::emitProgress );
auto result = jobitem.job->exec(); auto result = jobitem.job->exec();