fix: send unrecognized error on wrong http methods
This commit is contained in:
parent
c948324cf2
commit
3a45628e1d
7 changed files with 40 additions and 10 deletions
|
@ -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());
|
||||
}
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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())
|
||||
},
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue