Skip to content

Commit

Permalink
[Server] Add project path to bad layers message
Browse files Browse the repository at this point in the history
The QGIS Server logs can contained the list of bad layers but the project in which these bad layers are found was not in it.
  • Loading branch information
rldhont committed Jan 16, 2020
1 parent 10cbf59 commit 87cf08c
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions src/server/qgsconfigcache.cpp
Expand Up @@ -68,8 +68,9 @@ const QgsProject *QgsConfigCache::project( const QString &path )
}
if ( !unrestrictedBadLayers.isEmpty() )
{
const QString errorMsg = QStringLiteral( "Layer(s) %1 not valid" ).arg( unrestrictedBadLayers.join( ',' ) );
QgsMessageLog::logMessage( errorMsg, QStringLiteral( "Server" ), Qgis::Critical );
QgsMessageLog::logMessage(
QStringLiteral( "Error, Layer(s) %1 not valid in project %2" ).arg( unrestrictedBadLayers.join( QStringLiteral( ", " ) ), path ),
QStringLiteral( "Server" ), Qgis::Critical );
throw QgsServerException( QStringLiteral( "Layer(s) not valid" ) );
}
}
Expand All @@ -79,7 +80,7 @@ const QgsProject *QgsConfigCache::project( const QString &path )
else
{
QgsMessageLog::logMessage(
tr( "Error when loading project file '%1': %2 " ).arg( path, prj->error() ),
QStringLiteral( "Error when loading project file '%1': %2 " ).arg( path, prj->error() ),
QStringLiteral( "Server" ), Qgis::Critical );
}
}
Expand Down

0 comments on commit 87cf08c

Please sign in to comment.