From dcea99e278ee4cce2bbb33246ea0f266d8f36188 Mon Sep 17 00:00:00 2001
From: Teo Mrnjavac <teo@kde.org>
Date: Fri, 16 Sep 2016 10:52:42 +0200
Subject: [PATCH] Warning in debug output when the RequirementsChecker is
misconfigured. CAL-390 #close
---
src/modules/welcome/WelcomeViewStep.cpp | 4 ++++
.../welcome/checker/RequirementsChecker.cpp | 21 +++++++++++++++++++
2 files changed, 25 insertions(+)
diff --git a/src/modules/welcome/WelcomeViewStep.cpp b/src/modules/welcome/WelcomeViewStep.cpp
index ca24254e87..3c9d299936 100644
--- a/src/modules/welcome/WelcomeViewStep.cpp
+++ b/src/modules/welcome/WelcomeViewStep.cpp
@@ -20,6 +20,7 @@
#include "WelcomePage.h"
#include "checker/RequirementsChecker.h"
+#include "utils/Logger.h"
#include <QVariant>
@@ -128,5 +129,8 @@ WelcomeViewStep::setConfigurationMap( const QVariantMap& configurationMap )
if ( configurationMap.contains( "requirements" ) &&
configurationMap.value( "requirements" ).type() == QVariant::Map )
m_requirementsChecker->setConfigurationMap( configurationMap.value( "requirements" ).toMap() );
+ else
+ cDebug() << "WARNING: no valid requirements map found in welcome "
+ "module configuration.";
}
diff --git a/src/modules/welcome/checker/RequirementsChecker.cpp b/src/modules/welcome/checker/RequirementsChecker.cpp
index 0a7233e3dc..a8207a8762 100644
--- a/src/modules/welcome/checker/RequirementsChecker.cpp
+++ b/src/modules/welcome/checker/RequirementsChecker.cpp
@@ -185,6 +185,7 @@ RequirementsChecker::widget() const
void
RequirementsChecker::setConfigurationMap( const QVariantMap& configurationMap )
{
+ bool incompleteConfiguration = false;
if ( configurationMap.contains( "requiredStorage" ) &&
( configurationMap.value( "requiredStorage" ).type() == QVariant::Double ||
configurationMap.value( "requiredStorage" ).type() == QVariant::Int ) )
@@ -199,6 +200,7 @@ RequirementsChecker::setConfigurationMap( const QVariantMap& configurationMap )
else
{
m_requiredStorageGB = 3.;
+ incompleteConfiguration = true;
}
if ( configurationMap.contains( "requiredRam" ) &&
@@ -208,11 +210,15 @@ RequirementsChecker::setConfigurationMap( const QVariantMap& configurationMap )
bool ok = false;
m_requiredRamGB = configurationMap.value( "requiredRam" ).toDouble( &ok );
if ( !ok )
+ {
m_requiredRamGB = 1.;
+ incompleteConfiguration = true;
+ }
}
else
{
m_requiredRamGB = 1.;
+ incompleteConfiguration = true;
}
if ( configurationMap.contains( "check" ) &&
@@ -221,6 +227,8 @@ RequirementsChecker::setConfigurationMap( const QVariantMap& configurationMap )
m_entriesToCheck.clear();
m_entriesToCheck.append( configurationMap.value( "check" ).toStringList() );
}
+ else
+ incompleteConfiguration = true;
if ( configurationMap.contains( "required" ) &&
configurationMap.value( "required" ).type() == QVariant::List )
@@ -228,6 +236,19 @@ RequirementsChecker::setConfigurationMap( const QVariantMap& configurationMap )
m_entriesToRequire.clear();
m_entriesToRequire.append( configurationMap.value( "required" ).toStringList() );
}
+ else
+ incompleteConfiguration = true;
+
+ if ( incompleteConfiguration )
+ {
+ cDebug() << "WARNING: The RequirementsChecker configuration map provided by "
+ "the welcome module configuration file is incomplete or "
+ "incorrect.\n"
+ "Startup will continue for debugging purposes, but one or "
+ "more checks might not function correctly.\n"
+ "RequirementsChecker configuration map:\n"
+ << configurationMap;
+ }
}
--
GitLab