magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix tracing flame envfilter defaults; remove preprocessed cfgs

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2024-07-14 11:30:10 +00:00
parent 95006f7e46
commit e53c2fbc5a
1 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/core/config/mod.rs
View file

@ -166,19 +166,14 @@ pub struct Config {
#[serde(default)] #[serde(default)]
pub well_known: WellKnownConfig, pub well_known: WellKnownConfig,
#[serde(default)] #[serde(default)]
#[cfg(feature = "perf_measurements")]
pub allow_jaeger: bool, pub allow_jaeger: bool,
#[serde(default = "default_jaeger_filter")] #[serde(default = "default_jaeger_filter")]
#[cfg(feature = "perf_measurements")]
pub jaeger_filter: String, pub jaeger_filter: String,
#[serde(default)] #[serde(default)]
#[cfg(feature = "perf_measurements")]
pub tracing_flame: bool, pub tracing_flame: bool,
#[serde(default = "default_tracing_flame_filter")] #[serde(default = "default_tracing_flame_filter")]
#[cfg(feature = "perf_measurements")]
pub tracing_flame_filter: String, pub tracing_flame_filter: String,
#[serde(default = "default_tracing_flame_output_path")] #[serde(default = "default_tracing_flame_output_path")]
#[cfg(feature = "perf_measurements")]
pub tracing_flame_output_path: String, pub tracing_flame_output_path: String,
#[serde(default)] #[serde(default)]
pub proxy: ProxyConfig, pub proxy: ProxyConfig,
@ -672,11 +667,8 @@ impl fmt::Display for Config {
} }
&lst.into_iter().join(", ") &lst.into_iter().join(", ")
}); });
#[cfg(feature = "zstd_compression")]
line("Zstd HTTP Compression", &self.zstd_compression.to_string()); line("Zstd HTTP Compression", &self.zstd_compression.to_string());
#[cfg(feature = "gzip_compression")]
line("Gzip HTTP Compression", &self.gzip_compression.to_string()); line("Gzip HTTP Compression", &self.gzip_compression.to_string());
#[cfg(feature = "brotli_compression")]
line("Brotli HTTP Compression", &self.brotli_compression.to_string()); line("Brotli HTTP Compression", &self.brotli_compression.to_string());
line("RocksDB database LOG level", &self.rocksdb_log_level); line("RocksDB database LOG level", &self.rocksdb_log_level);
line("RocksDB database LOG to stderr", &self.rocksdb_log_stderr.to_string()); line("RocksDB database LOG to stderr", &self.rocksdb_log_stderr.to_string());
@ -925,10 +917,13 @@ fn default_pusher_idle_timeout() -> u64 { 15 }
fn default_max_fetch_prev_events() -> u16 { 100_u16 } fn default_max_fetch_prev_events() -> u16 { 100_u16 }
#[cfg(feature = "perf_measurements")] fn default_tracing_flame_filter() -> String {
fn default_tracing_flame_filter() -> String { "trace,h2=off".to_owned() } cfg!(debug_assertions)
.then_some("trace,h2=off")
.unwrap_or("info")
.to_owned()
}
#[cfg(feature = "perf_measurements")]
fn default_jaeger_filter() -> String { fn default_jaeger_filter() -> String {
cfg!(debug_assertions) cfg!(debug_assertions)
.then_some("trace,h2=off") .then_some("trace,h2=off")
@ -936,7 +931,6 @@ fn default_jaeger_filter() -> String {
.to_owned() .to_owned()
} }
#[cfg(feature = "perf_measurements")]
fn default_tracing_flame_output_path() -> String { "./tracing.folded".to_owned() } fn default_tracing_flame_output_path() -> String { "./tracing.folded".to_owned() }
fn default_trusted_servers() -> Vec<OwnedServerName> { vec![OwnedServerName::try_from("matrix.org").unwrap()] } fn default_trusted_servers() -> Vec<OwnedServerName> { vec![OwnedServerName::try_from("matrix.org").unwrap()] }