0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: add UID to debug lines of upload tasks

Browse Source 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
This commit is contained in:
Rachel Powers 2023-04-01 10:57:55 -07:00
parent cdccb25fe3
commit 6306fb564b
2 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
launcher/net/PasteUpload.cpp
View File

@ -149,7 +149,7 @@ void PasteUpload::executeTask()
void PasteUpload::downloadError(QNetworkReply::NetworkError error) void PasteUpload::downloadError(QNetworkReply::NetworkError error)
{ {
// error happened during download. // error happened during download.
qCCritical(taskUploadLogC) << "Network error: " << error; qCCritical(taskUploadLogC) << getUid().toString() << "Network error: " << error;
emitFailed(m_reply->errorString()); emitFailed(m_reply->errorString());
} }
@ -168,7 +168,7 @@ void PasteUpload::downloadFinished()
{ {
QString reasonPhrase = m_reply->attribute(QNetworkRequest::HttpReasonPhraseAttribute).toString(); QString reasonPhrase = m_reply->attribute(QNetworkRequest::HttpReasonPhraseAttribute).toString();
emitFailed(tr("Error: %1 returned unexpected status code %2 %3").arg(m_uploadUrl).arg(statusCode).arg(reasonPhrase)); emitFailed(tr("Error: %1 returned unexpected status code %2 %3").arg(m_uploadUrl).arg(statusCode).arg(reasonPhrase));
qCCritical(taskUploadLogC) << m_uploadUrl << " returned unexpected status code " << statusCode << " with body: " << data; qCCritical(taskUploadLogC) << getUid().toString() << m_uploadUrl << " returned unexpected status code " << statusCode << " with body: " << data;
m_reply.reset(); m_reply.reset();
return; return;
} }
@ -189,7 +189,7 @@ void PasteUpload::downloadFinished()
else else
{ {
emitFailed(tr("Error: %1 returned a malformed response body").arg(m_uploadUrl)); emitFailed(tr("Error: %1 returned a malformed response body").arg(m_uploadUrl));
qCCritical(taskUploadLogC) << m_uploadUrl << " returned malformed response body: " << data; qCCritical(taskUploadLogC) << getUid().toString() << getUid().toString() << m_uploadUrl << " returned malformed response body: " << data;
return; return;
} }
break; break;
@ -208,15 +208,15 @@ void PasteUpload::downloadFinished()
{ {
QString error = jsonObj["error"].toString(); QString error = jsonObj["error"].toString();
emitFailed(tr("Error: %1 returned an error: %2").arg(m_uploadUrl, error)); emitFailed(tr("Error: %1 returned an error: %2").arg(m_uploadUrl, error));
qCCritical(taskUploadLogC) << m_uploadUrl << " returned error: " << error; qCCritical(taskUploadLogC) << getUid().toString() << m_uploadUrl << " returned error: " << error;
qCCritical(taskUploadLogC) << "Response body: " << data; qCCritical(taskUploadLogC) << getUid().toString() << "Response body: " << data;
return; return;
} }
} }
else else
{ {
emitFailed(tr("Error: %1 returned a malformed response body").arg(m_uploadUrl)); emitFailed(tr("Error: %1 returned a malformed response body").arg(m_uploadUrl));
qCCritical(taskUploadLogC) << m_uploadUrl << " returned malformed response body: " << data; qCCritical(taskUploadLogC) << getUid().toString() << m_uploadUrl << " returned malformed response body: " << data;
return; return;
} }
break; break;
@ -236,16 +236,16 @@ void PasteUpload::downloadFinished()
QString error = jsonObj["error"].toString(); QString error = jsonObj["error"].toString();
QString message = (jsonObj.contains("message") && jsonObj["message"].isString()) ? jsonObj["message"].toString() : "none"; QString message = (jsonObj.contains("message") && jsonObj["message"].isString()) ? jsonObj["message"].toString() : "none";
emitFailed(tr("Error: %1 returned an error code: %2\nError message: %3").arg(m_uploadUrl, error, message)); emitFailed(tr("Error: %1 returned an error code: %2\nError message: %3").arg(m_uploadUrl, error, message));
qCCritical(taskUploadLogC) << m_uploadUrl << " returned error: " << error; qCCritical(taskUploadLogC) << getUid().toString() << m_uploadUrl << " returned error: " << error;
qCCritical(taskUploadLogC) << "Error message: " << message; qCCritical(taskUploadLogC) << getUid().toString() << "Error message: " << message;
qCCritical(taskUploadLogC) << "Response body: " << data; qCCritical(taskUploadLogC) << getUid().toString() << "Response body: " << data;
return; return;
} }
} }
else else
{ {
emitFailed(tr("Error: %1 returned a malformed response body").arg(m_uploadUrl)); emitFailed(tr("Error: %1 returned a malformed response body").arg(m_uploadUrl));
qCCritical(taskUploadLogC) << m_uploadUrl << " returned malformed response body: " << data; qCCritical(taskUploadLogC) << getUid().toString() << m_uploadUrl << " returned malformed response body: " << data;
return; return;
} }
break; break;

36
launcher/net/Upload.cpp
View File

@ -62,11 +62,11 @@ namespace Net {
void Upload::downloadError(QNetworkReply::NetworkError error) { void Upload::downloadError(QNetworkReply::NetworkError error) {
if (error == QNetworkReply::OperationCanceledError) { if (error == QNetworkReply::OperationCanceledError) {
qCCritical(taskUploadLogC) << "Aborted " << m_url.toString(); qCCritical(taskUploadLogC) << getUid().toString() << "Aborted " << m_url.toString();
m_state = State::AbortedByUser; m_state = State::AbortedByUser;
} else { } else {
// error happened during download. // error happened during download.
qCCritical(taskUploadLogC) << "Failed " << m_url.toString() << " with reason " << error; qCCritical(taskUploadLogC) << getUid().toString() << "Failed " << m_url.toString() << " with reason " << error;
m_state = State::Failed; m_state = State::Failed;
} }
} }
@ -74,9 +74,9 @@ namespace Net {
void Upload::sslErrors(const QList<QSslError> &errors) { void Upload::sslErrors(const QList<QSslError> &errors) {
int i = 1; int i = 1;
for (const auto& error : errors) { for (const auto& error : errors) {
qCCritical(taskUploadLogC) << "Upload" << m_url.toString() << "SSL Error #" << i << " : " << error.errorString(); qCCritical(taskUploadLogC) << getUid().toString() << "Upload" << m_url.toString() << "SSL Error #" << i << " : " << error.errorString();
auto cert = error.certificate(); auto cert = error.certificate();
qCCritical(taskUploadLogC) << "Certificate in question:\n" << cert.toText(); qCCritical(taskUploadLogC) << getUid().toString() << "Certificate in question:\n" << cert.toText();
i++; i++;
} }
} }
@ -119,17 +119,17 @@ namespace Net {
*/ */
redirect = QUrl(redirectStr, QUrl::TolerantMode); redirect = QUrl(redirectStr, QUrl::TolerantMode);
if (!redirect.isValid()) { if (!redirect.isValid()) {
qCWarning(taskUploadLogC) << "Failed to parse redirect URL:" << redirectStr; qCWarning(taskUploadLogC) << getUid().toString() << "Failed to parse redirect URL:" << redirectStr;
downloadError(QNetworkReply::ProtocolFailure); downloadError(QNetworkReply::ProtocolFailure);
return false; return false;
} }
qCDebug(taskUploadLogC) << "Fixed location header:" << redirect; qCDebug(taskUploadLogC) << getUid().toString() << "Fixed location header:" << redirect;
} else { } else {
qCDebug(taskUploadLogC) << "Location header:" << redirect; qCDebug(taskUploadLogC) << getUid().toString() << "Location header:" << redirect;
} }
m_url = QUrl(redirect.toString()); m_url = QUrl(redirect.toString());
qCDebug(taskUploadLogC) << "Following redirect to " << m_url.toString(); qCDebug(taskUploadLogC) << getUid().toString() << "Following redirect to " << m_url.toString();
startAction(m_network); startAction(m_network);
return true; return true;
} }
@ -138,25 +138,25 @@ namespace Net {
// handle HTTP redirection first // handle HTTP redirection first
// very unlikely for post requests, still can happen // very unlikely for post requests, still can happen
if (handleRedirect()) { if (handleRedirect()) {
qCDebug(taskUploadLogC) << "Upload redirected:" << m_url.toString(); qCDebug(taskUploadLogC) << getUid().toString() << "Upload redirected:" << m_url.toString();
return; return;
} }
// if the download failed before this point ... // if the download failed before this point ...
if (m_state == State::Succeeded) { if (m_state == State::Succeeded) {
qCDebug(taskUploadLogC) << "Upload failed but we are allowed to proceed:" << m_url.toString(); qCDebug(taskUploadLogC) << getUid().toString() << "Upload failed but we are allowed to proceed:" << m_url.toString();
m_sink->abort(); m_sink->abort();
m_reply.reset(); m_reply.reset();
emit succeeded(); emit succeeded();
return; return;
} else if (m_state == State::Failed) { } else if (m_state == State::Failed) {
qCDebug(taskUploadLogC) << "Upload failed in previous step:" << m_url.toString(); qCDebug(taskUploadLogC) << getUid().toString() << "Upload failed in previous step:" << m_url.toString();
m_sink->abort(); m_sink->abort();
m_reply.reset(); m_reply.reset();
emit failed(""); emit failed("");
return; return;
} else if (m_state == State::AbortedByUser) { } else if (m_state == State::AbortedByUser) {
qCDebug(taskUploadLogC) << "Upload aborted in previous step:" << m_url.toString(); qCDebug(taskUploadLogC) << getUid().toString() << "Upload aborted in previous step:" << m_url.toString();
m_sink->abort(); m_sink->abort();
m_reply.reset(); m_reply.reset();
emit aborted(); emit aborted();
@ -166,21 +166,21 @@ namespace Net {
// make sure we got all the remaining data, if any // make sure we got all the remaining data, if any
auto data = m_reply->readAll(); auto data = m_reply->readAll();
if (data.size()) { if (data.size()) {
qCDebug(taskUploadLogC) << "Writing extra" << data.size() << "bytes"; qCDebug(taskUploadLogC) << getUid().toString() << "Writing extra" << data.size() << "bytes";
m_state = m_sink->write(data); m_state = m_sink->write(data);
} }
// otherwise, finalize the whole graph // otherwise, finalize the whole graph
m_state = m_sink->finalize(*m_reply.get()); m_state = m_sink->finalize(*m_reply.get());
if (m_state != State::Succeeded) { if (m_state != State::Succeeded) {
qCDebug(taskUploadLogC) << "Upload failed to finalize:" << m_url.toString(); qCDebug(taskUploadLogC) << getUid().toString() << "Upload failed to finalize:" << m_url.toString();
m_sink->abort(); m_sink->abort();
m_reply.reset(); m_reply.reset();
emit failed(""); emit failed("");
return; return;
} }
m_reply.reset(); m_reply.reset();
qCDebug(taskUploadLogC) << "Upload succeeded:" << m_url.toString(); qCDebug(taskUploadLogC) << getUid().toString() << "Upload succeeded:" << m_url.toString();
emit succeeded(); emit succeeded();
} }
@ -195,7 +195,7 @@ namespace Net {
setStatus(tr("Uploading %1").arg(m_url.toString())); setStatus(tr("Uploading %1").arg(m_url.toString()));
if (m_state == State::AbortedByUser) { if (m_state == State::AbortedByUser) {
qCWarning(taskUploadLogC) << "Attempt to start an aborted Upload:" << m_url.toString(); qCWarning(taskUploadLogC) << getUid().toString() << "Attempt to start an aborted Upload:" << m_url.toString();
emit aborted(); emit aborted();
return; return;
} }
@ -204,10 +204,10 @@ namespace Net {
switch (m_state) { switch (m_state) {
case State::Succeeded: case State::Succeeded:
emitSucceeded(); emitSucceeded();
qCDebug(taskUploadLogC) << "Upload cache hit " << m_url.toString(); qCDebug(taskUploadLogC) << getUid().toString() << "Upload cache hit " << m_url.toString();
return; return;
case State::Running: case State::Running:
qCDebug(taskUploadLogC) << "Uploading " << m_url.toString(); qCDebug(taskUploadLogC) << getUid().toString() << "Uploading " << m_url.toString();
break; break;
case State::Inactive: case State::Inactive:
case State::Failed: case State::Failed: