rnhmjoj
/
nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make server connection errors more useful

This commit is contained in:
Nicolas Werner 2023-01-09 01:55:33 +01:00
parent 0b8709a0ea
commit 1d4b5e40a3
No known key found for this signature in database
GPG Key ID: C8D75E610773F2D9
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/LoginPage.cpp
View File

@ -125,16 +125,16 @@ LoginPage::onMatrixIdEntered()
if (!err->parse_error.empty()) { if (!err->parse_error.empty()) {
emit versionErrorCb(tr("Autodiscovery failed. Received malformed response.")); emit versionErrorCb(tr("Autodiscovery failed. Received malformed response."));
nhlog::net()->error("Autodiscovery failed. Received malformed response."); nhlog::net()->error("Autodiscovery failed. Received malformed response. {}",
err->parse_error);
return; return;
} }
emit versionErrorCb(tr("Autodiscovery failed. Unknown error when " emit versionErrorCb(tr("Autodiscovery failed. Unknown error when "
"requesting .well-known.")); "requesting .well-known."));
nhlog::net()->error("Autodiscovery failed. Unknown error when " nhlog::net()->error("Autodiscovery failed. Unknown error when "
"requesting .well-known. {} {}", "requesting .well-known. {}",
err->status_code, *err);
err->error_code);
return; return;
} }

17
src/RegisterPage.cpp
View File

@ -83,16 +83,16 @@ RegisterPage::setServer(const QString &server)
if (!err->parse_error.empty()) { if (!err->parse_error.empty()) {
setHsError(tr("Autodiscovery failed. Received malformed response.")); setHsError(tr("Autodiscovery failed. Received malformed response."));
nhlog::net()->error("Autodiscovery failed. Received malformed response."); nhlog::net()->error("Autodiscovery failed. Received malformed response. {}",
err->parse_error);
emit hsErrorChanged(); emit hsErrorChanged();
return; return;
} }
setHsError(tr("Autodiscovery failed. Unknown error when requesting .well-known.")); setHsError(tr("Autodiscovery failed. Unknown error when requesting .well-known."));
nhlog::net()->error("Autodiscovery failed. Unknown error when " nhlog::net()->error("Autodiscovery failed. Unknown error when "
"requesting .well-known. {} {}", "requesting .well-known. {}",
err->status_code, *err);
err->error_code);
return; return;
} }
@ -236,18 +236,13 @@ RegisterPage::startRegistration(const QString &username,
// The server requires registration flows. // The server requires registration flows.
if (err->status_code == 401 && err->matrix_error.unauthorized.flows.empty()) { if (err->status_code == 401 && err->matrix_error.unauthorized.flows.empty()) {
nhlog::net()->warn("failed to retrieve registration flows: " nhlog::net()->warn("failed to retrieve registration flows: {}", *err);
"status_code({}), matrix_error({}) ",
static_cast<int>(err->status_code),
err->matrix_error.error);
setError(QString::fromStdString(err->matrix_error.error)); setError(QString::fromStdString(err->matrix_error.error));
disconnect(UIA::instance(), &UIA::error, this, nullptr); disconnect(UIA::instance(), &UIA::error, this, nullptr);
return; return;
} }
nhlog::net()->error("failed to register: status_code ({}), matrix_error({})", nhlog::net()->error("failed to register: {}", *err);
static_cast<int>(err->status_code),
err->matrix_error.error);
setError(QString::fromStdString(err->matrix_error.error)); setError(QString::fromStdString(err->matrix_error.error));
disconnect(UIA::instance(), &UIA::error, this, nullptr); disconnect(UIA::instance(), &UIA::error, this, nullptr);