Log exceptions according Info or Critical errors

qgis · Mar 22, 2019 · eb72f16 · eb72f16
1 parent 6028b70
commit eb72f16
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/src/server/qgsserver.cpp b/src/server/qgsserver.cpp
@@ -347,11 +347,13 @@ void QgsServer::handleRequest( QgsServerRequest &request, QgsServerResponse &res
     catch ( QgsServerException &ex )
     {
       responseDecorator.write( ex );
+      QgsMessageLog::logMessage( ex.formatResponse(), QStringLiteral( "Server" ), Qgis::Info );
     }
     catch ( QgsException &ex )
     {
       // Internal server error
       response.sendError( 500, ex.what() );
+      QgsMessageLog::logMessage( ex.what(), QStringLiteral( "Server" ), Qgis::Critical );
     }
   }
   // Terminate the response

diff --git a/src/server/qgsserverexception.cpp b/src/server/qgsserverexception.cpp
@@ -27,6 +27,12 @@ QgsServerException::QgsServerException( const QString &message, int responseCode
 
 }
 
+QByteArray QgsServerException::formatResponse() const
+{
+  QString responseFormat;
+  return formatResponse( responseFormat );
+}
+
 QByteArray QgsServerException::formatResponse( QString &responseFormat ) const
 {
   QDomDocument doc;

diff --git a/src/server/qgsserverexception.h b/src/server/qgsserverexception.h
@@ -54,10 +54,12 @@ class SERVER_EXPORT QgsServerException
      * \param responseFormat QString to store the content type of the response format.
      * \returns QByteArray the fermatted response.
      *
-     * The defaolt implementation return text/xml format.
+     * The default implementation returns text/xml format.
      */
     virtual QByteArray formatResponse( QString &responseFormat SIP_OUT ) const;
 
+    QByteArray formatResponse() const;
+
   private:
     int mResponseCode;
 };

diff --git a/src/server/qgsserverresponse.cpp b/src/server/qgsserverresponse.cpp
@@ -80,7 +80,4 @@ void QgsServerResponse::write( const QgsServerException &ex )
   setStatusCode( ex.responseCode() );
   setHeader( "Content-Type", responseFormat );
   write( ba );
-
-  // log exception on server side too
-  QgsMessageLog::logMessage( ba, QStringLiteral( "Server" ), Qgis::Critical );
 }