Server: throw exception in GetMap if DB connection is not ok

mhugent · mhugent · commit 8757853b17f6 · 2019-01-15T14:34:56.000+01:00
diff --git a/src/core/qgsmaprendererjob.h b/src/core/qgsmaprendererjob.h
@@ -55,6 +55,7 @@ struct LayerRenderJob
   bool cached; // if true, img already contains cached image from previous rendering
   QgsWeakMapLayerPointer layer;
   int renderingTime; //!< Time it took to render the layer in ms (it is -1 if not rendered or still rendering)
+  QStringList errors; //! rendering errors
 };
 
 typedef QList<LayerRenderJob> LayerRenderJobs;
diff --git a/src/core/qgsmaprendererparalleljob.cpp b/src/core/qgsmaprendererparalleljob.cpp
@@ -195,6 +195,15 @@ void QgsMapRendererParallelJob::renderLayersFinished()
 {
   Q_ASSERT( mStatus == RenderingLayers );
 
+  LayerRenderJobs::const_iterator it = mLayerJobs.constBegin();
+  for ( ; it != mLayerJobs.constEnd(); ++it )
+  {
+    if ( !it->errors.isEmpty() )
+    {
+      mErrors.append( Error( it->layer->id(), it->errors.join( ',' ) ) );
+    }
+  }
+
   // compose final image
   mFinalImage = composeImage( mSettings, mLayerJobs, mLabelJob );
 
@@ -269,6 +278,8 @@ void QgsMapRendererParallelJob::renderLayerStatic( LayerRenderJob &job )
   {
     QgsDebugMsg( QStringLiteral( "Caught unhandled unknown exception" ) );
   }
+
+  job.errors = job.renderer->errors();
   job.renderingTime += t.elapsed();
   QgsDebugMsgLevel( QStringLiteral( "job %1 end [%2 ms] (layer %3)" ).arg( reinterpret_cast< quint64 >( &job ), 0, 16 ).arg( job.renderingTime ).arg( job.layer ? job.layer->id() : QString() ), 2 );
 }
diff --git a/src/core/qgsvectorlayerrenderer.cpp b/src/core/qgsvectorlayerrenderer.cpp
@@ -246,6 +246,11 @@ bool QgsVectorLayerRenderer::render()
   else
     drawRenderer( fit );
 
+  if ( !fit.isValid() )
+  {
+    mErrors.append( QStringLiteral( "Data source invalid" ) );
+  }
+
   if ( usingEffect )
   {
     mRenderer->paintEffect()->end( mContext );
diff --git a/src/providers/postgres/qgspostgresfeatureiterator.cpp b/src/providers/postgres/qgspostgresfeatureiterator.cpp
@@ -47,8 +47,9 @@ QgsPostgresFeatureIterator::QgsPostgresFeatureIterator( QgsPostgresFeatureSource
     mIsTransactionConnection = true;
   }
 
-  if ( !mConn )
+  if ( !mConn || mConn->PQstatus() != CONNECTION_OK )
   {
+    mValid = false;
     mClosed = true;
     iteratorClosed();
     return;
diff --git a/src/server/services/wms/qgsmaprendererjobproxy.cpp b/src/server/services/wms/qgsmaprendererjobproxy.cpp
@@ -66,6 +66,8 @@ namespace QgsWms
       renderJob.waitForFinished();
       *image = renderJob.renderedImage();
       mPainter.reset( new QPainter( image ) );
+
+      getRenderErrors( &renderJob );
     }
     else
     {
@@ -75,6 +77,7 @@ namespace QgsWms
       renderJob.setFeatureFilterProvider( mFeatureFilterProvider );
 #endif
       renderJob.renderSynchronously();
+      getRenderErrors( &renderJob );
     }
   }
 
@@ -83,4 +86,20 @@ namespace QgsWms
     return mPainter.release();
   }
 
+  void QgsMapRendererJobProxy::getRenderErrors( const QgsMapRendererJob *job )
+  {
+    if ( !job )
+    {
+      return;
+    }
+
+    mErrors.clear();
+    QgsMapRendererJob::Errors e = job->errors();
+    QgsMapRendererJob::Errors::const_iterator eIt = e.constBegin();
+    for ( ; eIt != e.constEnd(); ++eIt )
+    {
+      mErrors.append( qMakePair( eIt->layerID, eIt->message ) );
+    }
+  }
+
 } // namespace qgsws
diff --git a/src/server/services/wms/qgsmaprendererjobproxy.h b/src/server/services/wms/qgsmaprendererjobproxy.h
@@ -61,10 +61,17 @@ namespace QgsWms
        */
       QPainter *takePainter();
 
+      const QList< QPair< QString, QString > > &errors() const { return mErrors; }
+
     private:
       bool mParallelRendering;
       QgsFeatureFilterProvider *mFeatureFilterProvider = nullptr;
       std::unique_ptr<QPainter> mPainter;
+
+      void getRenderErrors( const QgsMapRendererJob *job );
+
+      //! Layer id / error message
+      QList< QPair< QString, QString > > mErrors;
   };
 
 
diff --git a/src/server/services/wms/qgswmsrenderer.cpp b/src/server/services/wms/qgswmsrenderer.cpp
@@ -2917,6 +2917,17 @@ namespace QgsWms
       QgsMapRendererJobProxy renderJob( mSettings.parallelRendering(), mSettings.maxThreads(), &filters );
       renderJob.render( mapSettings, &image );
       painter = renderJob.takePainter();
+
+      if ( !renderJob.errors().isEmpty() )
+      {
+        QString layerWMSName;
+        QgsMapLayer *errorLayer = mProject->mapLayer( renderJob.errors().at( 0 ).first );
+        if ( errorLayer )
+        {
+          layerWMSName = layerNickname( *errorLayer );
+        }
+        throw QgsServerException( QString( "Map rendering error in layer '%1'" ).arg( layerWMSName ) );
+      }
     }
 
     return painter;

Original file line number	Diff line number	Diff line change
`@@ -195,6 +195,15 @@ void QgsMapRendererParallelJob::renderLayersFinished()`
`195`	`195`	`{`
`196`	`196`	`Q_ASSERT( mStatus == RenderingLayers );`
`197`	`197`
	`198`	`+ LayerRenderJobs::const_iterator it = mLayerJobs.constBegin();`
	`199`	`+ for ( ; it != mLayerJobs.constEnd(); ++it )`
	`200`	`+ {`
	`201`	`+ if ( !it->errors.isEmpty() )`
	`202`	`+ {`
	`203`	`+ mErrors.append( Error( it->layer->id(), it->errors.join( ',' ) ) );`
	`204`	`+ }`
	`205`	`+ }`
	`206`	`+`
`198`	`207`	`// compose final image`
`199`	`208`	`mFinalImage = composeImage( mSettings, mLayerJobs, mLabelJob );`
`200`	`209`
`@@ -269,6 +278,8 @@ void QgsMapRendererParallelJob::renderLayerStatic( LayerRenderJob &job )`
`269`	`278`	`{`
`270`	`279`	`QgsDebugMsg( QStringLiteral( "Caught unhandled unknown exception" ) );`
`271`	`280`	`}`
	`281`	`+`
	`282`	`+ job.errors = job.renderer->errors();`
`272`	`283`	`job.renderingTime += t.elapsed();`
`273`	`284`	`QgsDebugMsgLevel( QStringLiteral( "job %1 end [%2 ms] (layer %3)" ).arg( reinterpret_cast< quint64 >( &job ), 0, 16 ).arg( job.renderingTime ).arg( job.layer ? job.layer->id() : QString() ), 2 );`
`274`	`285`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,8 +47,9 @@ QgsPostgresFeatureIterator::QgsPostgresFeatureIterator( QgsPostgresFeatureSource`
`47`	`47`	`mIsTransactionConnection = true;`
`48`	`48`	`}`
`49`	`49`
`50`		`- if ( !mConn )`
	`50`	`+ if ( !mConn \|\| mConn->PQstatus() != CONNECTION_OK )`
`51`	`51`	`{`
	`52`	`+ mValid = false;`
`52`	`53`	`mClosed = true;`
`53`	`54`	`iteratorClosed();`
`54`	`55`	`return;`