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

[Backport Release-3_10][Server] Add project path to bad layers message
qgis · Jan 17, 2020 · 1194f64 · 1194f64
2 parents c9dfe1b + 5598c8d
commit 1194f64
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/server/qgsconfigcache.cpp b/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 );
     }
   }