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

Improve logging in Module.cpp

Browse Source
This commit is contained in:
Teo Mrnjavac 2014-08-06 16:16:25 +02:00
parent be02eca90e
commit 014469c849
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/libcalamaresui/modulesystem/Module.cpp
View File

@ -66,15 +66,14 @@ Module::fromDescriptorFile( const QString& path )
if ( descriptorFile.exists() && descriptorFile.open( QFile::ReadOnly | QFile::Text ) )
{
QByteArray ba = descriptorFile.readAll();
cDebug() << Q_FUNC_INFO << "module descriptor file"
<< path << ":\n" << ba;
cDebug() << Q_FUNC_INFO << "module descriptor file" << path;
try
{
YAML::Node doc = YAML::Load( ba.constData() );
if ( !doc.IsMap() )
{
cDebug() << Q_FUNC_INFO << "bad module descriptor format"
cLog() << Q_FUNC_INFO << "bad module descriptor format"
<< path;
return nullptr;
}
@ -82,7 +81,7 @@ Module::fromDescriptorFile( const QString& path )
if ( !doc[ "type" ] ||
!doc[ "interface" ] )
{
cDebug() << Q_FUNC_INFO << "bad module descriptor format"
cLog() << Q_FUNC_INFO << "bad module descriptor format"
<< path;
return nullptr;
}
@ -110,7 +109,7 @@ Module::fromDescriptorFile( const QString& path )
if ( !m )
{
cDebug() << Q_FUNC_INFO << "bad module type or interface string"
cLog() << Q_FUNC_INFO << "bad module type or interface string"
<< path << typeString << intfString;
return nullptr;
}
@ -158,13 +157,13 @@ Module::loadConfigurationFile() //throws YAML::Exception
if ( configFile.exists() && configFile.open( QFile::ReadOnly | QFile::Text ) )
{
QByteArray ba = configFile.readAll();
cDebug() << Q_FUNC_INFO << "module configuration file"
cLog() << Q_FUNC_INFO << "module configuration file"
<< path << ":\n" << ba;
YAML::Node doc = YAML::Load( ba.constData() );
if ( !doc.IsMap() )
{
cDebug() << Q_FUNC_INFO << "bad module configuration format"
cLog() << Q_FUNC_INFO << "bad module configuration format"
<< path;
return;
}