add more debugging output to mapserver

jef · jef · commit 55cd73dbcb1b · 2011-02-12T13:49:25.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@15158 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/mapserver/qgis_map_serv.cpp b/src/mapserver/qgis_map_serv.cpp
@@ -41,7 +41,31 @@ map service syntax for SOAP/HTTP POST
 
 void dummyMessageHandler( QtMsgType type, const char *msg )
 {
-  //be quiet
+#ifdef QGSMSDEBUG
+  QString output;
+
+  switch ( type )
+  {
+    case QtDebugMsg:
+      output += "Debug: ";
+      break;
+    case QtCriticalMsg:
+      output += "Critical: ";
+      break;
+    case QtWarningMsg:
+      output += "Warning: ";
+      break;
+    case QtFatalMsg:
+      output += "Fatal: ";
+  }
+
+  output += msg;
+
+  QgsMapServerLogger::instance()->printMessage( output );
+
+  if ( type == QtFatalMsg )
+    abort();
+#endif
 }
 
 void printRequestInfos()
diff --git a/src/mapserver/qgsmapserverlogger.cpp b/src/mapserver/qgsmapserverlogger.cpp
@@ -50,20 +50,27 @@ int QgsMapServerLogger::setLogFilePath( const QString& path )
 
 void QgsMapServerLogger::printMessage( const QString& message )
 {
+  if ( !mLogFile.isOpen() )
+    return;
+
   mTextStream << message << endl;
 }
 
 void QgsMapServerLogger::printChar( QChar c )
 {
+  if ( !mLogFile.isOpen() )
+    return;
+
   mTextStream << c;
 }
 
 #ifdef QGSMSDEBUG
 void QgsMapServerLogger::printMessage( const char *file, const char *function, int line, const QString& message )
 {
-  mTextStream
-  << QString( "%1: %2: (%3) " ).arg( file ).arg( function ).arg( line )
-  << message
-  << endl;
+#if defined(_MSC_VER)
+  printMessage( QString( "%1(%2): (%3) %4" ).arg( file ).arg( line ).arg( function ).arg( line ).arg( message ) );
+#else
+  printMessage( QString( "%1: %2: (%3) %4" ).arg( file ).arg( line ).arg( function ).arg( line ).arg( message ) );
+#endif
 }
 #endif

Original file line number	Diff line number	Diff line change
`@@ -50,20 +50,27 @@ int QgsMapServerLogger::setLogFilePath( const QString& path )`
`50`	`50`
`51`	`51`	`void QgsMapServerLogger::printMessage( const QString& message )`
`52`	`52`	`{`
	`53`	`+ if ( !mLogFile.isOpen() )`
	`54`	`+ return;`
	`55`	`+`
`53`	`56`	`mTextStream << message << endl;`
`54`	`57`	`}`
`55`	`58`
`56`	`59`	`void QgsMapServerLogger::printChar( QChar c )`
`57`	`60`	`{`
	`61`	`+ if ( !mLogFile.isOpen() )`
	`62`	`+ return;`
	`63`	`+`
`58`	`64`	`mTextStream << c;`
`59`	`65`	`}`
`60`	`66`
`61`	`67`	`#ifdef QGSMSDEBUG`
`62`	`68`	`void QgsMapServerLogger::printMessage( const char file, const char function, int line, const QString& message )`
`63`	`69`	`{`
`64`		`- mTextStream`
`65`		`- << QString( "%1: %2: (%3) " ).arg( file ).arg( function ).arg( line )`
`66`		`- << message`
`67`		`- << endl;`
	`70`	`+#if defined(_MSC_VER)`
	`71`	`+ printMessage( QString( "%1(%2): (%3) %4" ).arg( file ).arg( line ).arg( function ).arg( line ).arg( message ) );`
	`72`	`+#else`
	`73`	`+ printMessage( QString( "%1: %2: (%3) %4" ).arg( file ).arg( line ).arg( function ).arg( line ).arg( message ) );`
	`74`	`+#endif`
`68`	`75`	`}`
`69`	`76`	`#endif`