mirror/matrix-rust-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-rust-sdk.git synced 2026-05-08 16:04:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

send queue: mark ConcurrentRequestFailed as recoverable

Browse Source 
This will still disable the room's send queue, but the embedder may then
decide whether to re-enable the queue or not, based on network
connectivity. Ideally, we'd implement some retry mechanism here too, but
since we're at a different layer than the HTTP one, we can't get that
"for free", so let the embedder decide what to do here.
This commit is contained in:
Benjamin Bouvier
2024-06-27 16:43:56 +02:00
parent 374da7674e
commit 17d18321f2
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
crates/matrix-sdk/src/error.rs
View File

@@ -320,8 +320,9 @@ pub enum Error {
#[error("a concurrent request failed; see logs for details")]
ConcurrentRequestFailed,
/// An other error was raised
/// this might happen because encryption was enabled on the base-crate
/// An other error was raised.
///
/// This might happen because encryption was enabled on the base-crate
/// but not here and that raised.
#[error("unknown error: {0}")]
UnknownError(Box<dyn std::error::Error + Send + Sync>),

19
crates/matrix-sdk/src/send_queue.rs
View File

@@ -468,11 +468,20 @@ impl RoomSendQueue {
}
Err(err) => {
let is_recoverable = if let crate::Error::Http(ref http_err) = err {
// All transient errors are recoverable.
matches!(http_err.retry_kind(), RetryKind::Transient { .. })
} else {
false
let is_recoverable = match err {
crate::Error::Http(ref http_err) => {
// All transient errors are recoverable.
matches!(http_err.retry_kind(), RetryKind::Transient { .. })
}
// `ConcurrentRequestFailed` typically happens because of an HTTP failure;
// since we don't get the underlying error, be lax and consider it
// recoverable, and let observers decide to retry it or not. At some point
// we'll get the actual underlying error.
crate::Error::ConcurrentRequestFailed => true,
// As of 2024-06-27, all other error types are considered unrecoverable.
_ => false,
};
if is_recoverable {