LemmyNet
/
pict-rs
mirror of https://git.asonix.dog/asonix/pict-rs
2
0
Fork 0
Code Releases Activity

Only use console config when console feature is enabled

This commit is contained in:
Aode (Lion) 2022-03-21 22:05:32 -05:00
parent 62615be371
commit f13f870a92
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/config.rs
View File

@ -82,6 +82,7 @@ pub(crate) struct Overrides {
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
sled_cache_capacity: Option<u64>, sled_cache_capacity: Option<u64>,
#[cfg(feature = "console")]
#[structopt( #[structopt(
long, long,
help = "Specify the number of events the console subscriber is allowed to buffer" help = "Specify the number of events the console subscriber is allowed to buffer"
@ -121,11 +122,19 @@ impl Overrides {
&& self.max_image_height.is_none() && self.max_image_height.is_none()
&& self.max_image_area.is_none() && self.max_image_area.is_none()
&& self.sled_cache_capacity.is_none() && self.sled_cache_capacity.is_none()
&& self.console_buffer_capacity.is_none() && self.default_console_settings()
&& self.api_key.is_none() && self.api_key.is_none()
&& self.opentelemetry_url.is_none() && self.opentelemetry_url.is_none()
&& self.store.is_none() && self.store.is_none()
} }
fn default_console_settings(&self) -> bool {
#[cfg(feature = "console")]
return self.console_buffer_capacity.is_none();
#[cfg(not(feature = "console"))]
true
}
} }
#[derive(Clone, Debug, serde::Deserialize, serde::Serialize)] #[derive(Clone, Debug, serde::Deserialize, serde::Serialize)]
@ -200,6 +209,7 @@ pub(crate) struct Config {
max_image_height: usize, max_image_height: usize,
max_image_area: usize, max_image_area: usize,
sled_cache_capacity: u64, sled_cache_capacity: u64,
#[cfg(feature = "console")]
console_buffer_capacity: usize, console_buffer_capacity: usize,
api_key: Option<String>, api_key: Option<String>,
opentelemetry_url: Option<Url>, opentelemetry_url: Option<Url>,
@ -216,6 +226,7 @@ pub(crate) struct Defaults {
max_image_height: usize, max_image_height: usize,
max_image_area: usize, max_image_area: usize,
sled_cache_capacity: u64, sled_cache_capacity: u64,
#[cfg(feature = "console")]
console_buffer_capacity: usize, console_buffer_capacity: usize,
store: Store, store: Store,
} }
@ -230,6 +241,7 @@ impl Defaults {
max_image_height: 10_000, max_image_height: 10_000,
max_image_area: 40_000_000, max_image_area: 40_000_000,
sled_cache_capacity: 1024 * 1024 * 64, // 16 times smaller than sled's default of 1GB sled_cache_capacity: 1024 * 1024 * 64, // 16 times smaller than sled's default of 1GB
#[cfg(feature = "console")]
console_buffer_capacity: 1024 * 128, console_buffer_capacity: 1024 * 128,
store: Store::FileStore { path: None }, store: Store::FileStore { path: None },
} }