mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-06-01 00:28:05 +00:00
a074564458
* Asyncify more * I guess these changed * Clean PR a bit * Convert more away from failure error * config changes for testing federation * It was DNS So actix-web's client relies on TRust DNS Resolver to figure out where to send data, but TRust DNS Resolver seems to not play nice with docker, which expressed itself as not resolving the name to an IP address _the first time_ when making a request. The fix was literally to make the request again (which I limited to 3 times total, and not exceeding the request timeout in total) * Only retry for connecterror Since TRust DNS Resolver was causing ConnectError::Timeout, this change limits the retry to only this error, returning immediately for any other error * Use http sig norm 0.4.0-alpha for actix-web 3.0 support * Blocking function, retry http requests * cargo +nightly fmt * Only create one pictrs dir * Don't yarn build * cargo +nightly fmt
52 lines
1.3 KiB
Rust
52 lines
1.3 KiB
Rust
use crate::LemmyError;
|
|
use std::future::Future;
|
|
|
|
#[derive(Clone, Debug, Fail)]
|
|
#[fail(display = "Error sending request, {}", _0)]
|
|
struct SendError(pub String);
|
|
|
|
#[derive(Clone, Debug, Fail)]
|
|
#[fail(display = "Error receiving response, {}", _0)]
|
|
pub struct RecvError(pub String);
|
|
|
|
pub async fn retry<F, Fut, T>(f: F) -> Result<T, LemmyError>
|
|
where
|
|
F: Fn() -> Fut,
|
|
Fut: Future<Output = Result<T, actix_web::client::SendRequestError>>,
|
|
{
|
|
retry_custom(|| async { Ok((f)().await) }).await
|
|
}
|
|
|
|
pub async fn retry_custom<F, Fut, T>(f: F) -> Result<T, LemmyError>
|
|
where
|
|
F: Fn() -> Fut,
|
|
Fut: Future<Output = Result<Result<T, actix_web::client::SendRequestError>, LemmyError>>,
|
|
{
|
|
let mut response = Err(format_err!("connect timeout").into());
|
|
|
|
for _ in 0u8..3 {
|
|
match (f)().await? {
|
|
Ok(t) => return Ok(t),
|
|
Err(e) => {
|
|
if is_connect_timeout(&e) {
|
|
response = Err(SendError(e.to_string()).into());
|
|
continue;
|
|
}
|
|
return Err(SendError(e.to_string()).into());
|
|
}
|
|
}
|
|
}
|
|
|
|
response
|
|
}
|
|
|
|
fn is_connect_timeout(e: &actix_web::client::SendRequestError) -> bool {
|
|
if let actix_web::client::SendRequestError::Connect(e) = e {
|
|
if let actix_web::client::ConnectError::Timeout = e {
|
|
return true;
|
|
}
|
|
}
|
|
|
|
false
|
|
}
|