[Server] Localize loadUrl messages in log

qgis · Sep 27, 2018 · 907c1a9 · 907c1a9
1 parent 00cfe7d
commit 907c1a9
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/src/server/qgsserverparameters.cpp b/src/server/qgsserverparameters.cpp
@@ -222,7 +222,9 @@ QString QgsServerParameterDefinition::loadUrl( bool &ok ) const
   QEventLoop loop;
   QObject::connect( &fetcher, &QgsNetworkContentFetcher::finished, &loop, &QEventLoop::quit );
 
-  QgsMessageLog::logMessage( QStringLiteral( "Request started [url: %1]" ).arg( url.toString() ) );
+  QgsMessageLog::logMessage(
+    QObject::tr( "Request started [url: %1]" ).arg( url.toString() ),
+    QStringLiteral( "Server" ) );
   QNetworkRequest request( url );
   request.setAttribute( QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferCache );
   request.setAttribute( QNetworkRequest::CacheSaveControlAttribute, true );
@@ -235,7 +237,9 @@ QString QgsServerParameterDefinition::loadUrl( bool &ok ) const
   if ( !reply )
   {
     ok = false;
-    QgsMessageLog::logMessage( QStringLiteral( "Request failed [error: no reply - url: %1]" ).arg( url.toString() ) );
+    QgsMessageLog::logMessage(
+      QObject::tr( "Request failed [error: no reply - url: %1]" ).arg( url.toString() ),
+      QStringLiteral( "Server" ) );
     return QString();
   }
 
@@ -245,20 +249,30 @@ QString QgsServerParameterDefinition::loadUrl( bool &ok ) const
     ok = false;
     if ( reply->error() != QNetworkReply::NoError )
     {
-      QgsMessageLog::logMessage( QStringLiteral( "Request failed [error: %1 - url: %2]" ).arg( reply->errorString(), reply->url().toString() ) );
+      QgsMessageLog::logMessage(
+        QObject::tr( "Request failed [error: %1 - url: %2]" ).arg( reply->errorString(), reply->url().toString() ),
+        QStringLiteral( "Server" ) );
     }
     QVariant phrase = reply->attribute( QNetworkRequest::HttpReasonPhraseAttribute );
-    QgsMessageLog::logMessage( QStringLiteral( "Request error [status: %1 - reason phrase: %2] for %3" ).arg( status.toInt() ).arg( phrase.toString(), reply->url().toString() ) );
+    QgsMessageLog::logMessage(
+      QObject::tr( "Request error [status: %1 - reason phrase: %2] for %3" ).arg( status.toInt() ).arg( phrase.toString(), reply->url().toString() ),
+      QStringLiteral( "Server" ) );
     return QString();
   }
 
   if ( reply->error() != QNetworkReply::NoError )
   {
     ok = false;
-    QgsMessageLog::logMessage( QStringLiteral( "Request failed [error: %1 - url: %2]" ).arg( reply->errorString(), reply->url().toString() ) );
+    QgsMessageLog::logMessage(
+      QObject::tr( "Request failed [error: %1 - url: %2]" ).arg( reply->errorString(), reply->url().toString() ),
+      QStringLiteral( "Server" ) );
     return QString();
   }
 
+  QgsMessageLog::logMessage(
+    QObject::tr( "Request finished [url: %1]" ).arg( url.toString() ),
+    QStringLiteral( "Server" ) );
+
   QString content = fetcher.contentAsString();
   ok = ( !content.isEmpty() );
   return content;

diff --git a/src/server/services/wms/qgswmsparameters.cpp b/src/server/services/wms/qgswmsparameters.cpp
@@ -97,7 +97,6 @@ namespace QgsWms
     if ( !ok )
     {
       const QString msg = QString( "%1 request error for %2" ).arg( name( mName ), url.toString() );
-      QgsMessageLog::logMessage( msg );
       QgsServerParameterDefinition::raiseError( msg );
     }