Fixed removing trailing slashes

This commit is contained in:
Martin Berg Alstad
2024-06-22 20:23:28 +02:00
parent 4b6608fd4f
commit 38fc8ce383
3 changed files with 16 additions and 9 deletions

View File

@ -1,4 +1,6 @@
use std::net::SocketAddr;
use axum::{ServiceExt};
use axum::extract::Request;
use lib::{create_app, join_routes};
use tokio::net::TcpListener;
@ -6,6 +8,8 @@ use tower_http::cors::{Any, CorsLayer};
use tower_http::normalize_path::NormalizePathLayer;
use tower_http::trace;
use tower_http::trace::TraceLayer;
use tower::Layer;
use tracing::Level;
use crate::routing::routes::*;
@ -34,15 +38,15 @@ async fn main() {
table::router()
].fallback(index::not_found);
let app = create_app!(routes,
CorsLayer::new().allow_origin(Any),
NormalizePathLayer::trim_trailing_slash(),
TraceLayer::new_for_http()
.make_span_with(trace::DefaultMakeSpan::new().level(Level::INFO))
.on_response(trace::DefaultOnResponse::new().level(Level::INFO))
);
let app = NormalizePathLayer::trim_trailing_slash()
.layer(create_app!(routes,
CorsLayer::new().allow_origin(Any),
TraceLayer::new_for_http()
.make_span_with(trace::DefaultMakeSpan::new().level(Level::INFO))
.on_response(trace::DefaultOnResponse::new().level(Level::INFO)),
));
tracing::info!("Starting server on: {addr}");
axum::serve(listener, app.into_make_service()).await.unwrap();
axum::serve(listener, ServiceExt::<Request>::into_make_service(app)).await.unwrap();
}