Avoid more noisy message log warnings

nyalldawson · nyalldawson · commit ff365abe29c2 · 2019-05-30T16:33:21.000+10:00
diff --git a/src/auth/oauth2/qgsauthoauth2method.cpp b/src/auth/oauth2/qgsauthoauth2method.cpp
@@ -415,8 +415,10 @@ void QgsAuthOAuth2Method::onNetworkError( QNetworkReply::NetworkError err )
   QNetworkReply *reply = qobject_cast<QNetworkReply *>( sender() );
   if ( !reply )
   {
+#ifdef QGISDEBUG
     msg = tr( "Network error but no reply object accessible" );
-    QgsMessageLog::logMessage( msg, AUTH_METHOD_KEY, Qgis::MessageLevel::Warning );
+    QgsDebugMsg( msg );
+#endif
     return;
   }
   if ( err != QNetworkReply::NoError && err != QNetworkReply::OperationCanceledError )
@@ -440,8 +442,11 @@ void QgsAuthOAuth2Method::onNetworkError( QNetworkReply::NetworkError err )
   QVariant phrase = reply->attribute( QNetworkRequest::HttpReasonPhraseAttribute );
   if ( phrase.isValid() )
   {
-    msg = tr( "Network error, HTTP status: %1" ).arg( phrase.toString() );
-    QgsMessageLog::logMessage( msg, AUTH_METHOD_KEY, Qgis::MessageLevel::Info );
+    if ( err != QNetworkReply::OperationCanceledError )
+    {
+      msg = tr( "Network error, HTTP status: %1" ).arg( phrase.toString() );
+      QgsMessageLog::logMessage( msg, AUTH_METHOD_KEY, Qgis::MessageLevel::Info );
+    }
   }
 
 
diff --git a/src/core/qgsblockingnetworkrequest.cpp b/src/core/qgsblockingnetworkrequest.cpp
@@ -372,9 +372,12 @@ void QgsBlockingNetworkRequest::replyFinished()
     }
     else
     {
-      mErrorMessage = mReply->errorString();
-      mErrorCode = ServerExceptionError;
-      QgsMessageLog::logMessage( mErrorMessage, tr( "Network" ) );
+      if ( mReply->error() != QNetworkReply::OperationCanceledError )
+      {
+        mErrorMessage = mReply->errorString();
+        mErrorCode = ServerExceptionError;
+        QgsMessageLog::logMessage( mErrorMessage, tr( "Network" ) );
+      }
       mReplyContent = QgsNetworkReplyContent( mReply );
     }
   }
diff --git a/src/gui/qgsmessagebar.cpp b/src/gui/qgsmessagebar.cpp
@@ -276,10 +276,18 @@ void QgsMessageBar::pushItem( QgsMessageBarItem *item )
   popWidget( item );
   showItem( item );
 
-  // Log all messages that are sent to the message bar into the message log so the
+  // Log all (non-empty) messages that are sent to the message bar into the message log so the
   // user can get them back easier.
-  QString formattedTitle = QStringLiteral( "%1 : %2" ).arg( item->title(), item->text() );
-  QgsMessageLog::logMessage( formattedTitle, tr( "Messages" ), item->level() );
+  QString formattedTitle;
+  if ( !item->title().isEmpty() && !item->text().isEmpty() )
+    formattedTitle = QStringLiteral( "%1 : %2" ).arg( item->title(), item->text() );
+  else if ( !item->title().isEmpty() )
+    formattedTitle = item->title();
+  else if ( !item->text().isEmpty() )
+    formattedTitle = item->text();
+
+  if ( !formattedTitle.isEmpty() )
+    QgsMessageLog::logMessage( formattedTitle, tr( "Messages" ), item->level() );
 }
 
 QgsMessageBarItem *QgsMessageBar::pushWidget( QWidget *widget, Qgis::MessageLevel level, int duration )

Original file line number	Diff line number	Diff line change
`@@ -415,8 +415,10 @@ void QgsAuthOAuth2Method::onNetworkError( QNetworkReply::NetworkError err )`
`415`	`415`	`QNetworkReply reply = qobject_cast<QNetworkReply >( sender() );`
`416`	`416`	`if ( !reply )`
`417`	`417`	`{`
	`418`	`+#ifdef QGISDEBUG`
`418`	`419`	`msg = tr( "Network error but no reply object accessible" );`
`419`		`- QgsMessageLog::logMessage( msg, AUTH_METHOD_KEY, Qgis::MessageLevel::Warning );`
	`420`	`+ QgsDebugMsg( msg );`
	`421`	`+#endif`
`420`	`422`	`return;`
`421`	`423`	`}`
`422`	`424`	`if ( err != QNetworkReply::NoError && err != QNetworkReply::OperationCanceledError )`
`@@ -440,8 +442,11 @@ void QgsAuthOAuth2Method::onNetworkError( QNetworkReply::NetworkError err )`
`440`	`442`	`QVariant phrase = reply->attribute( QNetworkRequest::HttpReasonPhraseAttribute );`
`441`	`443`	`if ( phrase.isValid() )`
`442`	`444`	`{`
`443`		`- msg = tr( "Network error, HTTP status: %1" ).arg( phrase.toString() );`
`444`		`- QgsMessageLog::logMessage( msg, AUTH_METHOD_KEY, Qgis::MessageLevel::Info );`
	`445`	`+ if ( err != QNetworkReply::OperationCanceledError )`
	`446`	`+ {`
	`447`	`+ msg = tr( "Network error, HTTP status: %1" ).arg( phrase.toString() );`
	`448`	`+ QgsMessageLog::logMessage( msg, AUTH_METHOD_KEY, Qgis::MessageLevel::Info );`
	`449`	`+ }`
`445`	`450`	`}`
`446`	`451`
`447`	`452`
Original file line number	Diff line number	Diff line change
`@@ -372,9 +372,12 @@ void QgsBlockingNetworkRequest::replyFinished()`
`372`	`372`	`}`
`373`	`373`	`else`
`374`	`374`	`{`
`375`		`- mErrorMessage = mReply->errorString();`
`376`		`- mErrorCode = ServerExceptionError;`
`377`		`- QgsMessageLog::logMessage( mErrorMessage, tr( "Network" ) );`
	`375`	`+ if ( mReply->error() != QNetworkReply::OperationCanceledError )`
	`376`	`+ {`
	`377`	`+ mErrorMessage = mReply->errorString();`
	`378`	`+ mErrorCode = ServerExceptionError;`
	`379`	`+ QgsMessageLog::logMessage( mErrorMessage, tr( "Network" ) );`
	`380`	`+ }`
`378`	`381`	`mReplyContent = QgsNetworkReplyContent( mReply );`
`379`	`382`	`}`
`380`	`383`	`}`