fix: send unrecognized error on wrong http methods

This commit is contained in:
Timo Kösters 2022-10-15 00:28:43 +02:00
parent c948324cf2
commit 3a45628e1d
No known key found for this signature in database
GPG key ID: 24DA7517711A2BA4
7 changed files with 40 additions and 10 deletions

View file

@ -55,7 +55,9 @@ where
Err(e) => {
warn!(
"Could not send request to appservice {:?} at {}: {}",
registration.get("id"), destination, e
registration.get("id"),
destination,
e
);
return Err(e.into());
}

View file

@ -443,7 +443,7 @@ pub(crate) async fn claim_keys_helper(
let mut futures: FuturesUnordered<_> = get_over_federation
.into_iter()
.map(|(server, vec)| async move {
let mut one_time_keys_input_fed = BTreeMap::new();
let mut one_time_keys_input_fed = BTreeMap::new();
for (user_id, keys) in vec {
one_time_keys_input_fed.insert(user_id.clone(), keys.clone());
}
@ -459,7 +459,8 @@ pub(crate) async fn claim_keys_helper(
)
.await,
)
}).collect();
})
.collect();
while let Some((server, response)) = futures.next().await {
match response {

View file

@ -1,7 +1,10 @@
use crate::{services, Error, Result, Ruma};
use ruma::{
api::client::{error::ErrorKind, read_marker::set_read_marker, receipt::create_receipt},
events::{receipt::{ReceiptType, ReceiptThread}, RoomAccountDataEventType},
events::{
receipt::{ReceiptThread, ReceiptType},
RoomAccountDataEventType,
},
MilliSecondsSinceUnixEpoch,
};
use std::collections::BTreeMap;

View file

@ -305,9 +305,12 @@ where
}
}
Err(e) => {
warn!("Could not send request to {} at {}: {}", destination, actual_destination_str, e);
warn!(
"Could not send request to {} at {}: {}",
destination, actual_destination_str, e
);
Err(e.into())
},
}
}
}