Skip to content

Commit abd6297

Browse files
committed
Write entry to server log if a datasource/map/print composition is not valid
1 parent 575d385 commit abd6297

File tree

3 files changed

+14
-2
lines changed

3 files changed

+14
-2
lines changed

src/server/qgsconfigcache.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ const QgsProject *QgsConfigCache::project( const QString &path )
4848
{
4949
if ( badLayerHandler->badLayers().size() > 0 )
5050
{
51+
QString errorMsg = QString( "Layer(s) %1 not valid" ).arg( badLayerHandler->badLayers().join( ',' ) );
52+
QgsMessageLog::logMessage( errorMsg, QStringLiteral( "Server" ), Qgis::Critical );
5153
throw QgsServerException( QStringLiteral( "Layer(s) not valid" ) );
5254
}
5355
mProjectCache.insert( path, prj.release() );

src/server/qgsfcgiserverrequest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ QgsFcgiServerRequest::QgsFcgiServerRequest()
6868
}
6969

7070
// Store the URL before the server rewrite that could have been set in QUERY_STRING
71-
//mOriginalUrl = url;
71+
mOriginalUrl = url;
7272

7373
// OGC parameters are passed with the query string, which is normally part of
7474
// the REQUEST_URI, we override the query string url in case it is defined

src/server/services/wms/qgswmsrenderer.cpp

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2930,11 +2930,16 @@ namespace QgsWms
29302930
if ( !renderJob.errors().isEmpty() )
29312931
{
29322932
QString layerWMSName;
2933-
QgsMapLayer *errorLayer = mProject->mapLayer( renderJob.errors().at( 0 ).layerID );
2933+
QString firstErrorLayerId = renderJob.errors().at( 0 ).layerID;
2934+
QgsMapLayer *errorLayer = mProject->mapLayer( firstErrorLayerId );
29342935
if ( errorLayer )
29352936
{
29362937
layerWMSName = layerNickname( *errorLayer );
29372938
}
2939+
2940+
//Log first error
2941+
QString errorMsg = QString( "Map rendering error in layer '%1'" ).arg( firstErrorLayerId );
2942+
QgsMessageLog::logMessage( errorMsg, "Server", Qgis::Critical );
29382943
throw QgsServerException( QString( "Map rendering error in layer '%1'" ).arg( layerWMSName ) );
29392944
}
29402945
}
@@ -3274,6 +3279,11 @@ namespace QgsWms
32743279
{
32753280
if ( !( *mapIt )->renderingErrors().isEmpty() )
32763281
{
3282+
//Log first error
3283+
QgsMapRendererJob::Error e = ( *mapIt )->renderingErrors().at( 0 );
3284+
QString errorMsg = QString( "Rendering error : '%1' in layer %2" ).arg( e.message ).arg( e.layerID );
3285+
QgsMessageLog::logMessage( errorMsg, "Server", Qgis::Critical );
3286+
32773287
throw QgsServerException( QStringLiteral( "Print error" ) );
32783288
}
32793289
}

0 commit comments

Comments
 (0)