Added more debugging info to wms server. Also when compiled in debug mode, it will write the last rendered image out to the system temp dir (overwriting it with each render)

timlinux · timlinux · commit a5d2844463d6 · 2011-12-06T12:32:50.000+02:00
diff --git a/src/mapserver/qgis_map_serv.cpp b/src/mapserver/qgis_map_serv.cpp
@@ -346,7 +346,7 @@ int main( int argc, char * argv[] )
       }
       catch ( QgsMapServiceException& ex )
       {
-        QgsDebugMsg( "Catched exception during GetMap request" );
+        QgsDebugMsg( "Caught exception during GetMap request" );
         theRequestHandler->sendServiceException( ex );
         delete theRequestHandler;
         delete theServer;
@@ -357,6 +357,7 @@ int main( int argc, char * argv[] )
       {
         QgsDebugMsg( "Sending GetMap response" );
         theRequestHandler->sendGetMapResponse( serviceString, result );
+        QgsDebugMsg( "Response sent" );
       }
       else
       {
@@ -477,6 +478,7 @@ int main( int argc, char * argv[] )
   }
 
   delete theMapRenderer;
+  QgsDebugMsg( "************* all done ***************" );
   return 0;
 }
 
diff --git a/src/mapserver/qgshttprequesthandler.cpp b/src/mapserver/qgshttprequesthandler.cpp
@@ -29,6 +29,7 @@
 #include <QStringList>
 #include <QUrl>
 #include <fcgi_stdio.h>
+#include "qgslogger.h"
 
 QgsHttpRequestHandler::QgsHttpRequestHandler(): QgsRequestHandler()
 {
@@ -42,6 +43,7 @@ QgsHttpRequestHandler::~QgsHttpRequestHandler()
 
 void QgsHttpRequestHandler::sendHttpResponse( QByteArray* ba, const QString& format ) const
 {
+  QgsDebugMsg("Checking byte array is ok to send...");
   if ( !ba )
   {
     return;
@@ -52,12 +54,16 @@ void QgsHttpRequestHandler::sendHttpResponse( QByteArray* ba, const QString& for
     return;
   }
 
+  QgsDebugMsg("Byte array looks good, returning response...");
+  QgsDebugMsg(QString("Content size: %1").arg(ba->size()));
+  QgsDebugMsg(QString("Content format: %1").arg(format));
   printf( "Content-Type: " );
   printf( format.toLocal8Bit() );
   printf( "\n" );
   printf( "Content-Length: %d\n", ba->size() );
   printf( "\n" );
-  fwrite( ba->data(), ba->size(), 1, FCGI_stdout );
+  int result=fwrite( ba->data(), ba->size(), 1, FCGI_stdout );
+  QgsDebugMsg(QString("Sent %1 bytes").arg(result));
 }
 
 QString QgsHttpRequestHandler::formatToMimeType( const QString& format ) const
@@ -84,10 +90,12 @@ QString QgsHttpRequestHandler::formatToMimeType( const QString& format ) const
 void QgsHttpRequestHandler::sendGetMapResponse( const QString& service, QImage* img ) const
 {
   Q_UNUSED( service );
+  QgsDebugMsg("Sending getmap response...");
   if ( img )
   {
     if ( mFormat != "PNG" && mFormat != "JPG" )
     {
+      QgsDebugMsg("service exception - incorrect image format requested...");
       sendServiceException( QgsMapServiceException( "InvalidFormat", "Output format '" + mFormat + "' is not supported in the GetMap request" ) );
       return;
     }
diff --git a/src/mapserver/qgswmsserver.cpp b/src/mapserver/qgswmsserver.cpp
@@ -581,7 +581,12 @@ QImage* QgsWMSServer::getMap()
   restoreLayerFilters( originalLayerFilters );
   clearFeatureSelections( selectedLayerIdList );
 
+  QgsDebugMsg("clearing filters");
   QgsMapLayerRegistry::instance()->mapLayers().clear();
+
+#ifdef QGISDEBUG
+  theImage->save( QDir::tempPath() + QDir::separator() + "lastrender.png" );
+#endif
   return theImage;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -346,7 +346,7 @@ int main( int argc, char * argv[] )`
`346`	`346`	`}`
`347`	`347`	`catch ( QgsMapServiceException& ex )`
`348`	`348`	`{`
`349`		`- QgsDebugMsg( "Catched exception during GetMap request" );`
	`349`	`+ QgsDebugMsg( "Caught exception during GetMap request" );`
`350`	`350`	`theRequestHandler->sendServiceException( ex );`
`351`	`351`	`delete theRequestHandler;`
`352`	`352`	`delete theServer;`
`@@ -357,6 +357,7 @@ int main( int argc, char * argv[] )`
`357`	`357`	`{`
`358`	`358`	`QgsDebugMsg( "Sending GetMap response" );`
`359`	`359`	`theRequestHandler->sendGetMapResponse( serviceString, result );`
	`360`	`+ QgsDebugMsg( "Response sent" );`
`360`	`361`	`}`
`361`	`362`	`else`
`362`	`363`	`{`
`@@ -477,6 +478,7 @@ int main( int argc, char * argv[] )`
`477`	`478`	`}`
`478`	`479`
`479`	`480`	`delete theMapRenderer;`
	`481`	`+ QgsDebugMsg( "*********** all done *************" );`
`480`	`482`	`return 0;`
`481`	`483`	`}`
`482`	`484`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@`
`29`	`29`	`#include <QStringList>`
`30`	`30`	`#include <QUrl>`
`31`	`31`	`#include <fcgi_stdio.h>`
	`32`	`+#include "qgslogger.h"`
`32`	`33`
`33`	`34`	`QgsHttpRequestHandler::QgsHttpRequestHandler(): QgsRequestHandler()`
`34`	`35`	`{`
`@@ -42,6 +43,7 @@ QgsHttpRequestHandler::~QgsHttpRequestHandler()`
`42`	`43`
`43`	`44`	`void QgsHttpRequestHandler::sendHttpResponse( QByteArray* ba, const QString& format ) const`
`44`	`45`	`{`
	`46`	`+ QgsDebugMsg("Checking byte array is ok to send...");`
`45`	`47`	`if ( !ba )`
`46`	`48`	`{`
`47`	`49`	`return;`
`@@ -52,12 +54,16 @@ void QgsHttpRequestHandler::sendHttpResponse( QByteArray* ba, const QString& for`
`52`	`54`	`return;`
`53`	`55`	`}`
`54`	`56`
	`57`	`+ QgsDebugMsg("Byte array looks good, returning response...");`
	`58`	`+ QgsDebugMsg(QString("Content size: %1").arg(ba->size()));`
	`59`	`+ QgsDebugMsg(QString("Content format: %1").arg(format));`
`55`	`60`	`printf( "Content-Type: " );`
`56`	`61`	`printf( format.toLocal8Bit() );`
`57`	`62`	`printf( "\n" );`
`58`	`63`	`printf( "Content-Length: %d\n", ba->size() );`
`59`	`64`	`printf( "\n" );`
`60`		`- fwrite( ba->data(), ba->size(), 1, FCGI_stdout );`
	`65`	`+ int result=fwrite( ba->data(), ba->size(), 1, FCGI_stdout );`
	`66`	`+ QgsDebugMsg(QString("Sent %1 bytes").arg(result));`
`61`	`67`	`}`
`62`	`68`
`63`	`69`	`QString QgsHttpRequestHandler::formatToMimeType( const QString& format ) const`
`@@ -84,10 +90,12 @@ QString QgsHttpRequestHandler::formatToMimeType( const QString& format ) const`
`84`	`90`	`void QgsHttpRequestHandler::sendGetMapResponse( const QString& service, QImage* img ) const`
`85`	`91`	`{`
`86`	`92`	`Q_UNUSED( service );`
	`93`	`+ QgsDebugMsg("Sending getmap response...");`
`87`	`94`	`if ( img )`
`88`	`95`	`{`
`89`	`96`	`if ( mFormat != "PNG" && mFormat != "JPG" )`
`90`	`97`	`{`
	`98`	`+ QgsDebugMsg("service exception - incorrect image format requested...");`
`91`	`99`	`sendServiceException( QgsMapServiceException( "InvalidFormat", "Output format '" + mFormat + "' is not supported in the GetMap request" ) );`
`92`	`100`	`return;`
`93`	`101`	`}`