Skip to content
Permalink
Browse files

Merge pull request #33858 from rldhont/backport-33849-to-release-3_10

[Backport Release-3_10][Server] Add project path to bad layers message
  • Loading branch information
rldhont committed Jan 17, 2020
2 parents c9dfe1b + 5598c8d commit 1194f6424c68505b972fa9e5f32691aa89598ff3
Showing with 4 additions and 3 deletions.
  1. +4 −3 src/server/qgsconfigcache.cpp
@@ -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" ) );
}
}
@@ -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 );
}
}

0 comments on commit 1194f64

Please sign in to comment.
You can’t perform that action at this time.