Skip to content

Commit 03450d2

Browse files
committed
fix panic in metrics webserver without templates
1 parent e4c879b commit 03450d2

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/web/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ use std::{
5151
borrow::{Borrow, Cow},
5252
net::SocketAddr,
5353
sync::Arc,
54-
thread,
5554
};
5655
use tower::ServiceBuilder;
5756
use tower_http::{catch_panic::CatchPanicLayer, timeout::TimeoutLayer, trace::TraceLayer};
@@ -273,6 +272,7 @@ fn apply_middleware(
273272
template_data: Option<Arc<TemplateData>>,
274273
) -> Result<AxumRouter> {
275274
let config = context.config()?;
275+
let has_templates = template_data.is_some();
276276
Ok(router.layer(
277277
ServiceBuilder::new()
278278
.layer(TraceLayer::new_for_http())
@@ -293,9 +293,9 @@ fn apply_middleware(
293293
.layer(Extension(context.repository_stats_updater()?))
294294
.layer(option_layer(template_data.map(Extension)))
295295
.layer(middleware::from_fn(csp::csp_middleware))
296-
.layer(middleware::from_fn(
296+
.layer(option_layer(has_templates.then_some(middleware::from_fn(
297297
page::web_page::render_templates_middleware,
298-
))
298+
))))
299299
.layer(middleware::from_fn(cache::cache_middleware)),
300300
))
301301
}

0 commit comments

Comments
 (0)