diff options
| author | Nicolas Werner <nicolas.werner@hotmail.de> | 2023-01-09 01:55:33 +0100 |
|---|---|---|
| committer | Nicolas Werner <nicolas.werner@hotmail.de> | 2023-01-09 01:55:33 +0100 |
| commit | 1d4b5e40a3349857586c9f1a9d6c99850f7b5ae0 (patch) | |
| tree | 869f1bcb9834635214d0317b5ec96a9a7ee3090a | |
| parent | 0b8709a0ead4bdc71666f09860a058c90e3c7a1a (diff) | |
Make server connection errors more useful
| -rw-r--r-- | src/LoginPage.cpp | 8 | ||||
| -rw-r--r-- | src/RegisterPage.cpp | 17 |
2 files changed, 10 insertions, 15 deletions
diff --git a/src/LoginPage.cpp b/src/LoginPage.cpp index d243691c..a1222b62 100644 --- a/src/LoginPage.cpp +++ b/src/LoginPage.cpp @@ -125,16 +125,16 @@ LoginPage::onMatrixIdEntered() if (!err->parse_error.empty()) { 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; } emit versionErrorCb(tr("Autodiscovery failed. Unknown error when " "requesting .well-known.")); nhlog::net()->error("Autodiscovery failed. Unknown error when " - "requesting .well-known. {} {}", - err->status_code, - err->error_code); + "requesting .well-known. {}", + *err); return; } diff --git a/src/RegisterPage.cpp b/src/RegisterPage.cpp index 0db0427c..c2d2b9d7 100644 --- a/src/RegisterPage.cpp +++ b/src/RegisterPage.cpp @@ -83,16 +83,16 @@ RegisterPage::setServer(const QString &server) if (!err->parse_error.empty()) { 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(); return; } setHsError(tr("Autodiscovery failed. Unknown error when requesting .well-known.")); nhlog::net()->error("Autodiscovery failed. Unknown error when " - "requesting .well-known. {} {}", - err->status_code, - err->error_code); + "requesting .well-known. {}", + *err); return; } @@ -236,18 +236,13 @@ RegisterPage::startRegistration(const QString &username, // The server requires registration flows. if (err->status_code == 401 && err->matrix_error.unauthorized.flows.empty()) { - nhlog::net()->warn("failed to retrieve registration flows: " - "status_code({}), matrix_error({}) ", - static_cast<int>(err->status_code), - err->matrix_error.error); + nhlog::net()->warn("failed to retrieve registration flows: {}", *err); setError(QString::fromStdString(err->matrix_error.error)); disconnect(UIA::instance(), &UIA::error, this, nullptr); return; } - nhlog::net()->error("failed to register: status_code ({}), matrix_error({})", - static_cast<int>(err->status_code), - err->matrix_error.error); + nhlog::net()->error("failed to register: {}", *err); setError(QString::fromStdString(err->matrix_error.error)); disconnect(UIA::instance(), &UIA::error, this, nullptr); |