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

[welcome] Improve logging of requirements-checking

Browse Source 
- less chatty when 0-results come in
- compress the welcome debug to one output chunk
This commit is contained in:
Adriaan de Groot 2021-03-15 20:53:59 +01:00
parent f8afb15c4c
commit 33fec86ef6
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libcalamares/modulesystem/RequirementsChecker.cpp
View File

@ -85,9 +85,9 @@ void
RequirementsChecker::addCheckedRequirements( Module* m ) RequirementsChecker::addCheckedRequirements( Module* m )
{ {
RequirementsList l = m->checkRequirements(); RequirementsList l = m->checkRequirements();
cDebug() << "Got" << l.count() << "requirement results from" << m->name();
if ( l.count() > 0 ) if ( l.count() > 0 )
{ {
cDebug() << "Got" << l.count() << "requirement results from" << m->name();
m_model->addRequirementsList( l ); m_model->addRequirementsList( l );
} }

16
src/modules/welcome/checker/GeneralRequirements.cpp
View File

@ -107,14 +107,12 @@ GeneralRequirements::checkRequirements()
&& ( availableSize.height() >= CalamaresUtils::windowMinimumHeight ); && ( availableSize.height() >= CalamaresUtils::windowMinimumHeight );
qint64 requiredStorageB = CalamaresUtils::GiBtoBytes( m_requiredStorageGiB ); qint64 requiredStorageB = CalamaresUtils::GiBtoBytes( m_requiredStorageGiB );
cDebug() << "Need at least storage bytes:" << requiredStorageB;
if ( m_entriesToCheck.contains( "storage" ) ) if ( m_entriesToCheck.contains( "storage" ) )
{ {
enoughStorage = checkEnoughStorage( requiredStorageB ); enoughStorage = checkEnoughStorage( requiredStorageB );
} }
qint64 requiredRamB = CalamaresUtils::GiBtoBytes( m_requiredRamGiB ); qint64 requiredRamB = CalamaresUtils::GiBtoBytes( m_requiredRamGiB );
cDebug() << "Need at least ram bytes:" << requiredRamB;
if ( m_entriesToCheck.contains( "ram" ) ) if ( m_entriesToCheck.contains( "ram" ) )
{ {
enoughRam = checkEnoughRam( requiredRamB ); enoughRam = checkEnoughRam( requiredRamB );
@ -135,10 +133,18 @@ GeneralRequirements::checkRequirements()
isRoot = checkIsRoot(); isRoot = checkIsRoot();
} }
using TNum = Logger::DebugRow< const char*, qint64 >;
using TR = Logger::DebugRow< const char*, MaybeChecked >; using TR = Logger::DebugRow< const char*, MaybeChecked >;
cDebug() << "GeneralRequirements output:" << TR( "enoughStorage", enoughStorage ) << TR( "enoughRam", enoughRam ) // clang-format off
<< TR( "hasPower", hasPower ) << TR( "hasInternet", hasInternet ) << TR( "isRoot", isRoot ); cDebug() << "GeneralRequirements output:"
<< TNum( "storage", requiredStorageB )
<< TR( "enoughStorage", enoughStorage )
<< TNum( "RAM", requiredRamB )
<< TR( "enoughRam", enoughRam )
<< TR( "hasPower", hasPower )
<< TR( "hasInternet", hasInternet )
<< TR( "isRoot", isRoot );
// clang-format on
Calamares::RequirementsList checkEntries; Calamares::RequirementsList checkEntries;
foreach ( const QString& entry, m_entriesToCheck ) foreach ( const QString& entry, m_entriesToCheck )
{ {