Merge lp:~mandel/ubuntu-download-manager/better-error-logging into lp:ubuntu-download-manager

[Manuel de la Peña]

Fix bug 1346196 by using human readable strings.

The code is duplicated and not present in src/common/public/ubuntu/transfers/system/logger.cpp so that we do not expose QNetwork to the user of the client lib.

[lp:~mandel/ubuntu-download-manager/better-error-logging]

330. By Manuel de la Peña on 2014-07-21

Fix tabbing.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:330
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/707/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-utopic-amd64-ci/66
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-utopic-armhf-ci/66
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-utopic-armhf-ci/66/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/707/rebuild

review: Approve (continuous-integration)

[Oliver Grawert (ogra)]

looks fine

[Oliver Grawert (ogra)]

review: Approve

=== modified file 'src/common/public/ubuntu/transfers/system/logger.cpp'
--- src/common/public/ubuntu/transfers/system/logger.cpp	2014-07-21 12:38:46 +0000
+++ src/common/public/ubuntu/transfers/system/logger.cpp	2014-07-21 12:38:46 +0000
@@ -91,7 +91,7 @@
 }
 
 namespace {
-    const QString LOG_NAME = "ubuntu-download-manager.log";
+    const QString LOG_NAME = QCoreApplication::instance()->applicationName() + ".log";
 }
 
 namespace Ubuntu {
@@ -139,7 +139,7 @@
 Logger::getLogDir() {
     QString path = ""; 
     if (getuid() == 0) {
-        path = "/var/log/ubuntu-download-manager";
+        path = "/var/log/" + QCoreApplication::instance()->applicationName();
     } else {
         path = QStandardPaths::writableLocation(
             QStandardPaths::CacheLocation);

=== modified file 'src/downloads/priv/ubuntu/downloads/file_download.cpp'
--- src/downloads/priv/ubuntu/downloads/file_download.cpp	2014-07-21 12:38:46 +0000
+++ src/downloads/priv/ubuntu/downloads/file_download.cpp	2014-07-21 12:38:46 +0000
@@ -24,6 +24,7 @@
 #include <QFileInfo>
 #include <QSslError>
 #include <glog/logging.h>
+#include <map>
 #include <ubuntu/transfers/system/hash_algorithm.h>
 #include <ubuntu/transfers/system/cryptographic_hash.h>
 #include <ubuntu/transfers/system/logger.h>
@@ -36,6 +37,99 @@
 #define DOWN_LOG(LEVEL) LOG(LEVEL) << ((parent() != nullptr)?"GroupDownload {" + parent()->objectName() + " } ":"") << "Download ID{" << objectName() << " } "
 
 
+std::ostream& operator<<(std::ostream &out, QNetworkReply::NetworkError err) {
+    static std::map<QNetworkReply::NetworkError, std::string> errorsMap {
+        {QNetworkReply::ConnectionRefusedError, "ConnectionRefusedError: the remote "
+                "server refused the connection (the server is not accepting "
+                "requests)"},
+        {QNetworkReply::RemoteHostClosedError, "RemoteHostClosedError: the remote "
+                "server closed the connection prematurely, before the entire reply "
+                "was received and processed"},
+        {QNetworkReply::HostNotFoundError, "HostNotFoundError: the remote host name "
+                "was not found (invalid hostname)"},
+        {QNetworkReply::TimeoutError, "TimeoutError: the connection to the remote "
+                "server timed out"},
+        {QNetworkReply::OperationCanceledError, "OperationCanceledError: the "
+                "operation was canceled via calls to abort() or close() before "
+                "it was finished."},
+        {QNetworkReply::SslHandshakeFailedError, "SslHandshakeFailedError: the "
+                "SSL/TLS handshake failed and the encrypted channel could not "
+                "be established."},
+        {QNetworkReply::TemporaryNetworkFailureError, "TemporaryNetworkFailureError: "
+                "the connection was broken "
+                "due to disconnection from the network, however the system has "
+                "initiated roaming to another access point. The request should be "
+                "resubmitted and will be processed as soon as the connection is "
+                "re-established."},
+        {QNetworkReply::NetworkSessionFailedError, "NetworkSessionFailedError: the "
+                "connection was broken due to disconnection from the network or "
+                "failure to start the network."},
+        {QNetworkReply::BackgroundRequestNotAllowedError, 
+                "BackgroundRequestNotAllowedError: the background request is "
+                "not currently allowed due to platform policy."},
+        {QNetworkReply::ProxyConnectionRefusedError, "ProxyConnectionRefusedError: "
+                "the connection to the proxy server was refused (the proxy server "
+                "is not accepting requests)"},
+        {QNetworkReply::ProxyConnectionClosedError, "ProxyConnectionClosedError: the "
+                "proxy server closed the connection prematurely, before the entire "
+                "reply was received and processed"},
+        {QNetworkReply::ProxyNotFoundError, "ProxyNotFoundError: the proxy host name "
+                "was not found (invalid proxy hostname)"},
+        {QNetworkReply::ProxyTimeoutError, "ProxyTimeoutError: the connection to "
+                "the proxy timed out or the proxy did not reply in time to the "
+                "request sent"},
+        {QNetworkReply::ProxyAuthenticationRequiredError,
+                "ProxyAuthenticationRequiredError: the proxy requires "
+                "authentication in order to honour the request but did not accept "
+                "any credentials offered (if any)"},
+        {QNetworkReply::ContentAccessDenied, "ContentAccessDenied: the access to "
+                "the remote content was denied (similar to HTTP error 401)"},
+        {QNetworkReply::ContentOperationNotPermittedError,
+                "ContentOperationNotPermittedError: the operation requested "
+                "on the remote content is not permitted"},
+        {QNetworkReply::ContentNotFoundError, "ContentNotFoundError: the remote "
+                "content was not found at the server (similar to HTTP error 404)"},
+        {QNetworkReply::AuthenticationRequiredError, "AuthenticationRequiredError: "
+                "the remote server requires authentication to serve the content "
+                "but the credentials provided were not accepted (if any)."},
+        {QNetworkReply::ContentReSendError, "ContentReSendError: the request needed "
+                "to be sent again, but this failed for example because the upload "
+                "data could not be read a second time."},
+        {QNetworkReply::ContentConflictError, "ContentConflictError: the request "
+                "could not be completed due to a conflict with the current state "
+                "of the resource."},
+        {QNetworkReply::ContentGoneError, "ContentGoneError: the requested resource "
+                "is no longer available at the server."},
+        {QNetworkReply::InternalServerError, "InternalServerError: the server "
+                "encountered an unexpected condition which prevented it from "
+                "fulfilling the request."},
+        {QNetworkReply::OperationNotImplementedError,
+                "OperationNotImplementedError: the server does not support "
+                "the functionality required to fulfill the request."},
+        {QNetworkReply::ServiceUnavailableError, "ServiceUnavailableError: the "
+                "server is unable to handle the request at this time."},
+        {QNetworkReply::ProtocolUnknownError, "ProtocolUnknownError: the Network "
+                "Access API cannot honor the request because the protocol "
+                "is not known"},
+        {QNetworkReply::ProtocolInvalidOperationError,
+                "ProtocolInvalidOperationError: the requested operation is "
+                "invalid for this protocol"},
+        {QNetworkReply::UnknownNetworkError,
+                "UnknownNetworkError: an unknown network-related error was "
+                "detected"},
+        {QNetworkReply::UnknownProxyError, "UnknownProxyError: an unknown "
+                "proxy-related error was detected"},
+        {QNetworkReply::UnknownContentError, "UnknownContentError: an unknown "
+                "error related to the remote content was detected"},
+        {QNetworkReply::ProtocolFailure, "ProtocolFailure: a breakdown in protocol "
+                "was detected (parsing error, invalid or unexpected responses, etc.)"},
+        {QNetworkReply::UnknownServerError, "UnknownServerError: an unknown error "
+                "related to the server response was detected"}
+    };
+    out << "Network error " << errorsMap[err];
+    return out;
+}
+
 namespace {
 
     const QString DATA_FILE_NAME = "data.download";
@@ -723,11 +817,11 @@
         DOWN_LOG(INFO) << "Rename '" << _tempFilePath << "' to '"
             << _filePath << "'";
         QFile tempFile(_tempFilePath);
-	auto r = tempFile.rename(_filePath);
-	if (!r) {
+        auto r = tempFile.rename(_filePath);
+        if (!r) {
             DOWN_LOG(WARNING) << "Could not rename '" << _tempFilePath << "' to '"
                 << _filePath << "' due to " << tempFile.errorString();
-	}
+        }
     }
 
     setState(Download::FINISH);
@@ -741,7 +835,7 @@
 FileDownload::unlockFilePath() {
     if (!isConfined() && metadata().contains(Metadata::LOCAL_PATH_KEY)) {
         _fileNameMutex->unlockFileName(_tempFilePath);
-	} else {
+    } else {
         _fileNameMutex->unlockFileName(_filePath);
     }
 }

=== modified file 'src/uploads/priv/ubuntu/uploads/file_upload.cpp'
--- src/uploads/priv/ubuntu/uploads/file_upload.cpp	2014-07-21 12:38:46 +0000
+++ src/uploads/priv/ubuntu/uploads/file_upload.cpp	2014-07-21 12:38:46 +0000
@@ -25,6 +25,99 @@
 
 #define UP_LOG(LEVEL) LOG(LEVEL) << "Upload ID{" << objectName() << " } "
 
+std::ostream& operator<<(std::ostream &out, QNetworkReply::NetworkError err) {
+    static std::map<QNetworkReply::NetworkError, std::string> errorsMap {
+        {QNetworkReply::ConnectionRefusedError, "ConnectionRefusedError: the remote "
+                "server refused the connection (the server is not accepting "
+                "requests)"},
+        {QNetworkReply::RemoteHostClosedError, "RemoteHostClosedError: the remote "
+                "server closed the connection prematurely, before the entire reply "
+                "was received and processed"},
+        {QNetworkReply::HostNotFoundError, "HostNotFoundError: the remote host name "
+                "was not found (invalid hostname)"},
+        {QNetworkReply::TimeoutError, "TimeoutError: the connection to the remote "
+                "server timed out"},
+        {QNetworkReply::OperationCanceledError, "OperationCanceledError: the "
+                "operation was canceled via calls to abort() or close() before "
+                "it was finished."},
+        {QNetworkReply::SslHandshakeFailedError, "SslHandshakeFailedError: the "
+                "SSL/TLS handshake failed and the encrypted channel could not "
+                "be established."},
+        {QNetworkReply::TemporaryNetworkFailureError, "TemporaryNetworkFailureError: "
+                "the connection was broken "
+                "due to disconnection from the network, however the system has "
+                "initiated roaming to another access point. The request should be "
+                "resubmitted and will be processed as soon as the connection is "
+                "re-established."},
+        {QNetworkReply::NetworkSessionFailedError, "NetworkSessionFailedError: the "
+                "connection was broken due to disconnection from the network or "
+                "failure to start the network."},
+        {QNetworkReply::BackgroundRequestNotAllowedError, 
+                "BackgroundRequestNotAllowedError: the background request is "
+                "not currently allowed due to platform policy."},
+        {QNetworkReply::ProxyConnectionRefusedError, "ProxyConnectionRefusedError: "
+                "the connection to the proxy server was refused (the proxy server "
+                "is not accepting requests)"},
+        {QNetworkReply::ProxyConnectionClosedError, "ProxyConnectionClosedError: the "
+                "proxy server closed the connection prematurely, before the entire "
+                "reply was received and processed"},
+        {QNetworkReply::ProxyNotFoundError, "ProxyNotFoundError: the proxy host name "
+                "was not found (invalid proxy hostname)"},
+        {QNetworkReply::ProxyTimeoutError, "ProxyTimeoutError: the connection to "
+                "the proxy timed out or the proxy did not reply in time to the "
+                "request sent"},
+        {QNetworkReply::ProxyAuthenticationRequiredError,
+                "ProxyAuthenticationRequiredError: the proxy requires "
+                "authentication in order to honour the request but did not accept "
+                "any credentials offered (if any)"},
+        {QNetworkReply::ContentAccessDenied, "ContentAccessDenied: the access to "
+                "the remote content was denied (similar to HTTP error 401)"},
+        {QNetworkReply::ContentOperationNotPermittedError,
+                "ContentOperationNotPermittedError: the operation requested "
+                "on the remote content is not permitted"},
+        {QNetworkReply::ContentNotFoundError, "ContentNotFoundError: the remote "
+                "content was not found at the server (similar to HTTP error 404)"},
+        {QNetworkReply::AuthenticationRequiredError, "AuthenticationRequiredError: "
+                "the remote server requires authentication to serve the content "
+                "but the credentials provided were not accepted (if any)."},
+        {QNetworkReply::ContentReSendError, "ContentReSendError: the request needed "
+                "to be sent again, but this failed for example because the upload "
+                "data could not be read a second time."},
+        {QNetworkReply::ContentConflictError, "ContentConflictError: the request "
+                "could not be completed due to a conflict with the current state "
+                "of the resource."},
+        {QNetworkReply::ContentGoneError, "ContentGoneError: the requested resource "
+                "is no longer available at the server."},
+        {QNetworkReply::InternalServerError, "InternalServerError: the server "
+                "encountered an unexpected condition which prevented it from "
+                "fulfilling the request."},
+        {QNetworkReply::OperationNotImplementedError,
+                "OperationNotImplementedError: the server does not support "
+                "the functionality required to fulfill the request."},
+        {QNetworkReply::ServiceUnavailableError, "ServiceUnavailableError: the "
+                "server is unable to handle the request at this time."},
+        {QNetworkReply::ProtocolUnknownError, "ProtocolUnknownError: the Network "
+                "Access API cannot honor the request because the protocol "
+                "is not known"},
+        {QNetworkReply::ProtocolInvalidOperationError,
+                "ProtocolInvalidOperationError: the requested operation is "
+                "invalid for this protocol"},
+        {QNetworkReply::UnknownNetworkError,
+                "UnknownNetworkError: an unknown network-related error was "
+                "detected"},
+        {QNetworkReply::UnknownProxyError, "UnknownProxyError: an unknown "
+                "proxy-related error was detected"},
+        {QNetworkReply::UnknownContentError, "UnknownContentError: an unknown "
+                "error related to the remote content was detected"},
+        {QNetworkReply::ProtocolFailure, "ProtocolFailure: a breakdown in protocol "
+                "was detected (parsing error, invalid or unexpected responses, etc.)"},
+        {QNetworkReply::UnknownServerError, "UnknownServerError: an unknown error "
+                "related to the server response was detected"}
+    };
+    out << "Network error " << errorsMap[err];
+    return out;
+}
+
 namespace {
     const QString CONTENT_TYPE_HEADER = "multipart/form-data;";
     const QString NETWORK_ERROR = "NETWORK ERROR";