From 87bf761dc2a44a49825ea21ffb293785e5272b5d Mon Sep 17 00:00:00 2001
From: Joseph Donofry <joedonofry@gmail.com>
Date: Thu, 4 Mar 2021 18:56:25 -0500
Subject: [PATCH] Properly format matrix errors in spdlog statements
---
src/Cache.cpp | 2 +-
src/DeviceVerificationFlow.cpp | 8 ++++----
src/ui/UserProfile.cpp | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/Cache.cpp b/src/Cache.cpp
index dccf1e702..5ec3f32cc 100644
--- a/src/Cache.cpp
+++ b/src/Cache.cpp
@@ -3572,7 +3572,7 @@ Cache::query_keys(const std::string &user_id,
if (err) {
nhlog::net()->warn(
"failed to query device keys: {},{}",
- err->matrix_error.errcode,
+ mtx::errors::to_string(err->matrix_error.errcode),
static_cast<int>(err->status_code));
cb({}, err);
return;
diff --git a/src/DeviceVerificationFlow.cpp b/src/DeviceVerificationFlow.cpp
index c6277a9d3..0f0de5a67 100644
--- a/src/DeviceVerificationFlow.cpp
+++ b/src/DeviceVerificationFlow.cpp
@@ -45,7 +45,7 @@ DeviceVerificationFlow::DeviceVerificationFlow(QObject *,
user_id, [user_id, this](const UserKeyCache &res, mtx::http::RequestErr err) {
if (err) {
nhlog::net()->warn("failed to query device keys: {},{}",
- err->matrix_error.errcode,
+ mtx::errors::to_string(err->matrix_error.errcode),
static_cast<int>(err->status_code));
return;
}
@@ -64,7 +64,7 @@ DeviceVerificationFlow::DeviceVerificationFlow(QObject *,
[this](const UserKeyCache &res, mtx::http::RequestErr err) {
if (err) {
nhlog::net()->warn("failed to query device keys: {},{}",
- err->matrix_error.errcode,
+ mtx::errors::to_string(err->matrix_error.errcode),
static_cast<int>(err->status_code));
return;
}
@@ -345,7 +345,7 @@ DeviceVerificationFlow::DeviceVerificationFlow(QObject *,
if (err) {
nhlog::net()->error(
"failed to upload signatures: {},{}",
- err->matrix_error.errcode,
+ mtx::errors::to_string(err->matrix_error.errcode),
static_cast<int>(err->status_code));
}
@@ -356,7 +356,7 @@ DeviceVerificationFlow::DeviceVerificationFlow(QObject *,
"id {}: {}, {}",
user_id,
key_id,
- e.errcode,
+ mtx::errors::to_string(e.errcode),
e.error);
});
}
diff --git a/src/ui/UserProfile.cpp b/src/ui/UserProfile.cpp
index 77f6ced52..311c13146 100644
--- a/src/ui/UserProfile.cpp
+++ b/src/ui/UserProfile.cpp
@@ -159,7 +159,7 @@ UserProfile::fetchDeviceList(const QString &userID)
mtx::http::RequestErr err) {
if (err) {
nhlog::net()->warn("failed to query device keys: {},{}",
- err->matrix_error.errcode,
+ mtx::errors::to_string(err->matrix_error.errcode),
static_cast<int>(err->status_code));
return;
}
@@ -174,7 +174,7 @@ UserProfile::fetchDeviceList(const QString &userID)
if (err) {
nhlog::net()->warn("failed to query device keys: {},{}",
- err->matrix_error.errcode,
+ mtx::errors::to_string(err->matrix_error.errcode),
static_cast<int>(err->status_code));
return;
}
--
GitLab