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

minor reductions

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2024-06-17 04:57:41 +00:00
parent 1c0ed91f6f
commit 98d96b89a5
2 changed files with 23 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/router/layers.rs
View file

@ -84,28 +84,28 @@ fn compression_layer(server: &Server) -> tower_http::compression::CompressionLay
#[cfg(feature = "zstd_compression")] #[cfg(feature = "zstd_compression")]
{ {
if server.config.zstd_compression { compression_layer = if server.config.zstd_compression {
compression_layer = compression_layer.zstd(true); compression_layer.zstd(true)
} else { } else {
compression_layer = compression_layer.no_zstd(); compression_layer.no_zstd()
}; };
}; };
#[cfg(feature = "gzip_compression")] #[cfg(feature = "gzip_compression")]
{ {
if server.config.gzip_compression { compression_layer = if server.config.gzip_compression {
compression_layer = compression_layer.gzip(true); compression_layer.gzip(true)
} else { } else {
compression_layer = compression_layer.no_gzip(); compression_layer.no_gzip()
}; };
}; };
#[cfg(feature = "brotli_compression")] #[cfg(feature = "brotli_compression")]
{ {
if server.config.brotli_compression { compression_layer = if server.config.brotli_compression {
compression_layer = compression_layer.br(true); compression_layer.br(true)
} else { } else {
compression_layer = compression_layer.no_br(); compression_layer.no_br()
}; };
}; };
@ -179,11 +179,10 @@ fn catch_panic(err: Box<dyn Any + Send + 'static>) -> http::Response<http_body_u
} }
fn tracing_span<T>(request: &http::Request<T>) -> tracing::Span { fn tracing_span<T>(request: &http::Request<T>) -> tracing::Span {
let path = if let Some(path) = request.extensions().get::<MatchedPath>() { let path = request
path.as_str() .extensions()
} else { .get::<MatchedPath>()
request.uri().path() .map_or_else(|| request.uri().path(), |p| p.as_str());
};
tracing::info_span!("router:", %path) tracing::info_span!("router:", %path)
} }

14
src/service/admin/console.rs
View file

@ -167,10 +167,16 @@ impl Console {
} }
fn set_history(&self, readline: &mut Readline) { fn set_history(&self, readline: &mut Readline) {
let history = self.history.lock().expect("locked"); self.history
for entry in history.iter().rev() { .lock()
readline.add_history_entry(entry.clone()); .expect("locked")
} .iter()
.rev()
.for_each(|entry| {
readline
.add_history_entry(entry.clone())
.expect("added history entry");
});
} }
fn add_history(&self, line: String) { fn add_history(&self, line: String) {