From 9a9430b5e19124506093c3ee32f04db5a40f0058 Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 28 May 2021 15:21:15 +0400 Subject: [PATCH] Move some logging to DEBUG_LOG instead of LOG. --- Telegram/SourceFiles/mtproto/connection_http.cpp | 8 +++++++- .../mtproto/details/mtproto_domain_resolver.cpp | 6 +++++- .../SourceFiles/mtproto/details/mtproto_tcp_socket.cpp | 6 +++--- Telegram/SourceFiles/mtproto/special_config_request.cpp | 4 ++-- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/Telegram/SourceFiles/mtproto/connection_http.cpp b/Telegram/SourceFiles/mtproto/connection_http.cpp index ee0d4756f..3417651e3 100644 --- a/Telegram/SourceFiles/mtproto/connection_http.cpp +++ b/Telegram/SourceFiles/mtproto/connection_http.cpp @@ -122,7 +122,13 @@ qint32 HttpConnection::handleError(QNetworkReply *reply) { // returnes "maybe ba case QNetworkReply::TemporaryNetworkFailureError: case QNetworkReply::NetworkSessionFailedError: case QNetworkReply::BackgroundRequestNotAllowedError: - case QNetworkReply::UnknownNetworkError: LOG(("HTTP Error: network error %1 - %2").arg(reply->error()).arg(reply->errorString())); break; + case QNetworkReply::UnknownNetworkError: + if (reply->error() == QNetworkReply::UnknownNetworkError) { + DEBUG_LOG(("HTTP Error: network error %1 - %2").arg(reply->error()).arg(reply->errorString())); + } else { + LOG(("HTTP Error: network error %1 - %2").arg(reply->error()).arg(reply->errorString())); + } + break; // proxy errors (101-199): case QNetworkReply::ProxyConnectionRefusedError: diff --git a/Telegram/SourceFiles/mtproto/details/mtproto_domain_resolver.cpp b/Telegram/SourceFiles/mtproto/details/mtproto_domain_resolver.cpp index 27e607222..c28e1335d 100644 --- a/Telegram/SourceFiles/mtproto/details/mtproto_domain_resolver.cpp +++ b/Telegram/SourceFiles/mtproto/details/mtproto_domain_resolver.cpp @@ -72,6 +72,10 @@ QByteArray DnsUserAgent() { std::vector ParseDnsResponse( const QByteArray &bytes, std::optional typeRestriction) { + if (bytes.isEmpty()) { + return {}; + } + // Read and store to "result" all the data bytes from the response: // { .., // "Answer": [ @@ -339,7 +343,7 @@ QByteArray DomainResolver::finalizeRequest( const AttemptKey &key, not_null reply) { if (reply->error() != QNetworkReply::NoError) { - LOG(("Resolve Error: Failed to get response, error: %2 (%3)" + DEBUG_LOG(("Resolve Error: Failed to get response, error: %2 (%3)" ).arg(reply->errorString() ).arg(reply->error())); } diff --git a/Telegram/SourceFiles/mtproto/details/mtproto_tcp_socket.cpp b/Telegram/SourceFiles/mtproto/details/mtproto_tcp_socket.cpp index aec382f3d..7da7e6fce 100644 --- a/Telegram/SourceFiles/mtproto/details/mtproto_tcp_socket.cpp +++ b/Telegram/SourceFiles/mtproto/details/mtproto_tcp_socket.cpp @@ -122,9 +122,9 @@ void TcpSocket::LogError(int errorCode, const QString &errorText) { LOG(("TCP Error: socket timeout - %1").arg(errorText)); break; - case QAbstractSocket::NetworkError: - LOG(("TCP Error: network - %1").arg(errorText)); - break; + case QAbstractSocket::NetworkError: { + DEBUG_LOG(("TCP Error: network - %1").arg(errorText)); + } break; case QAbstractSocket::ProxyAuthenticationRequiredError: case QAbstractSocket::ProxyConnectionRefusedError: diff --git a/Telegram/SourceFiles/mtproto/special_config_request.cpp b/Telegram/SourceFiles/mtproto/special_config_request.cpp index f1239bba9..12f292a7a 100644 --- a/Telegram/SourceFiles/mtproto/special_config_request.cpp +++ b/Telegram/SourceFiles/mtproto/special_config_request.cpp @@ -380,7 +380,7 @@ void SpecialConfigRequest::requestFinished( not_null reply) { handleHeaderUnixtime(reply); const auto result = finalizeRequest(reply); - if (!_callback) { + if (!_callback || result.isEmpty()) { return; } @@ -407,7 +407,7 @@ void SpecialConfigRequest::requestFinished( QByteArray SpecialConfigRequest::finalizeRequest( not_null reply) { if (reply->error() != QNetworkReply::NoError) { - LOG(("Config Error: Failed to get response, error: %2 (%3)" + DEBUG_LOG(("Config Error: Failed to get response, error: %2 (%3)" ).arg(reply->errorString() ).arg(reply->error())); }