grishka/lemmy
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add upload_timeout to PictrsConfig (#4159)

Browse source 
* Add upload timeout to PictrsConfig

* Bad space 🤔

* Update PictrsConfig upload timeout to include units.
This commit is contained in:
İsmail Karslı 2023-11-17 12:01:32 +03:00 committed by GitHub
parent 525359f7c5
commit 2070381e81
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/defaults.hjson
View file

@ -52,6 +52,8 @@
# hotlinking is allowed. If that is the case for your instance, make sure that this setting is # hotlinking is allowed. If that is the case for your instance, make sure that this setting is
# disabled. # disabled.
cache_external_link_previews: true cache_external_link_previews: true
# Timeout for uploading images to pictrs (in seconds)
upload_timeout: 30
} }
# Email sending configuration. All options except login/password are mandatory # Email sending configuration. All options except login/password are mandatory
email: { email: {

2
crates/routes/src/images.rs
View file

@ -107,7 +107,7 @@ async fn upload(
client_req = client_req.header("X-Forwarded-For", addr.to_string()) client_req = client_req.header("X-Forwarded-For", addr.to_string())
}; };
let res = client_req let res = client_req
.timeout(Duration::from_secs(30)) .timeout(Duration::from_secs(pictrs_config.upload_timeout))
.body(Body::wrap_stream(make_send(body))) .body(Body::wrap_stream(make_send(body)))
.send() .send()
.await .await

4
crates/utils/src/settings/structs.rs
View file

@ -89,6 +89,10 @@ pub struct PictrsConfig {
/// disabled. /// disabled.
#[default(true)] #[default(true)]
pub cache_external_link_previews: bool, pub cache_external_link_previews: bool,
/// Timeout for uploading images to pictrs (in seconds)
#[default(30)]
pub upload_timeout: u64,
} }
#[derive(Debug, Deserialize, Serialize, Clone, SmartDefault, Document)] #[derive(Debug, Deserialize, Serialize, Clone, SmartDefault, Document)]