sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-01 00:46:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix overly noisy o2 debug messages/warnings

Browse Source
This commit is contained in:
Nyall Dawson 2019-05-30 13:36:36 +10:00
parent d383073277
commit 75c720a659
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/auth/oauth2/qgsauthoauth2method.cpp
View File

@ -243,8 +243,10 @@ bool QgsAuthOAuth2Method::updateNetworkRequest( QNetworkRequest &request, const
{
case QgsAuthOAuth2Config::Header:
request.setRawHeader( O2_HTTP_AUTHORIZATION_HEADER, QStringLiteral( "Bearer %1" ).arg( o2->token() ).toAscii() );
#ifdef QGISDEBUG
msg = QStringLiteral( "Updated request HEADER with access token for authcfg: %1" ).arg( authcfg );
QgsMessageLog::logMessage( msg, AUTH_METHOD_KEY, Qgis::MessageLevel::Info );
QgsDebugMsgLevel( msg, 2 );
#endif
break;
case QgsAuthOAuth2Config::Form:
// FIXME: what to do here if the parent request is not POST?
@ -258,13 +260,17 @@ bool QgsAuthOAuth2Method::updateNetworkRequest( QNetworkRequest &request, const
query.addQueryItem( O2_OAUTH2_ACCESS_TOKEN, o2->token() );
url.setQuery( query );
request.setUrl( url );
#ifdef QGISDEBUG
msg = QStringLiteral( "Updated request QUERY with access token for authcfg: %1" ).arg( authcfg );
#endif
}
else
{
#ifdef QGISDEBUG
msg = QStringLiteral( "Updated request QUERY with access token SKIPPED (existing token) for authcfg: %1" ).arg( authcfg );
#endif
}
QgsMessageLog::logMessage( msg, AUTH_METHOD_KEY, Qgis::MessageLevel::Info );
QgsDebugMsgLevel( msg, 2 );
break;
}
@ -296,8 +302,10 @@ bool QgsAuthOAuth2Method::updateNetworkReply( QNetworkReply *reply, const QStrin
//connect( reply, static_cast<void ( QNetworkReply::* )( QNetworkReply::NetworkError )>( &QNetworkReply::error ),
// this, &QgsAuthOAuth2Method::onNetworkError, Qt::QueuedConnection );
#ifdef QGISDEBUG
QString msg = QStringLiteral( "Updated reply with token refresh connection for authcfg: %1" ).arg( authcfg );
QgsMessageLog::logMessage( msg, AUTH_METHOD_KEY, Qgis::MessageLevel::Info );
QgsDebugMsgLevel( msg, 2 );
#endif
return true;
}
@ -411,7 +419,7 @@ void QgsAuthOAuth2Method::onNetworkError( QNetworkReply::NetworkError err )
QgsMessageLog::logMessage( msg, AUTH_METHOD_KEY, Qgis::MessageLevel::Warning );
return;
}
if ( err != QNetworkReply::NoError )
if ( err != QNetworkReply::NoError && err != QNetworkReply::OperationCanceledError )
{
msg = tr( "Network error: %1" ).arg( reply->errorString() );
QgsMessageLog::logMessage( msg, AUTH_METHOD_KEY, Qgis::MessageLevel::Warning );
@ -422,8 +430,11 @@ void QgsAuthOAuth2Method::onNetworkError( QNetworkReply::NetworkError err )
QVariant status = reply->attribute( QNetworkRequest::HttpStatusCodeAttribute );
if ( !status.isValid() )
{
msg = tr( "Network error but no reply object attributes found" );
QgsMessageLog::logMessage( msg, AUTH_METHOD_KEY, Qgis::MessageLevel::Warning );
if ( err != QNetworkReply::OperationCanceledError )
{
msg = tr( "Network error but no reply object attributes found" );
QgsMessageLog::logMessage( msg, AUTH_METHOD_KEY, Qgis::MessageLevel::Warning );
}
return;
}
QVariant phrase = reply->attribute( QNetworkRequest::HttpReasonPhraseAttribute );