summaryrefslogtreecommitdiff
path: root/src/api/appservice_server.rs
diff options
context:
space:
mode:
authorTimo Kösters <timo@koesters.xyz>2022-10-13 10:14:52 +0200
committerTimo Kösters <timo@koesters.xyz>2022-10-13 10:15:35 +0200
commitac52b234fa87e1e5690bf97efb7dcf4f50a9ed1d (patch)
tree1464d4970cf0450378a77689a814ec16123ea037 /src/api/appservice_server.rs
parent37eb686b5b6c49ed830fda9d43bafb31851e224a (diff)
downloadconduit-ac52b234fa87e1e5690bf97efb7dcf4f50a9ed1d.zip
fix: all the e2ee problems
Diffstat (limited to 'src/api/appservice_server.rs')
-rw-r--r--src/api/appservice_server.rs14
1 files changed, 12 insertions, 2 deletions
diff --git a/src/api/appservice_server.rs b/src/api/appservice_server.rs
index 6dca60b..339a0c2 100644
--- a/src/api/appservice_server.rs
+++ b/src/api/appservice_server.rs
@@ -45,11 +45,21 @@ where
*reqwest_request.timeout_mut() = Some(Duration::from_secs(30));
let url = reqwest_request.url().clone();
- let mut response = services()
+ let mut response = match services()
.globals
.default_client()
.execute(reqwest_request)
- .await?;
+ .await
+ {
+ Ok(r) => r,
+ Err(e) => {
+ warn!(
+ "Could not send request to appservice {:?} at {}: {}",
+ registration.get("id"), destination, e
+ );
+ return Err(e.into());
+ }
+ };
// reqwest::Response -> http::Response conversion
let status = response.status();