axum-server: Show User-Agent:

[learn-rust.git] / axum-server / src / main.rs

diff --git a/axum-server/src/main.rs b/axum-server/src/main.rs
index aa2a26337a2551d44d1a77d3cc598214d97fffa0..3212d3f250962e2f422419951e1ce0fd0d355b13 100644 (file)
--- a/axum-server/src/main.rs
+++ b/axum-server/src/main.rs
@@ -1,12 +1,18 @@
+use std::io;
+
 use axum::{
-    routing::{get},
-    extract::Path,
-    http,
+    routing::{get, get_service},
+    extract::{Path, TypedHeader},
+    http::{StatusCode},
     response,
     Router};
 
-async fn hello(Path(name): Path<String>) -> impl response::IntoResponse {
-    (http::StatusCode::OK, format!("Hello {}", name))
+async fn hello(Path(name): Path<String>, user_agent: Option<TypedHeader<axum::headers::UserAgent>>) -> impl response::IntoResponse {
+    if let Some(TypedHeader(user_agent)) = user_agent {
+        (StatusCode::OK, format!("Hello {} from {}", name, user_agent))
+    } else {
+        (StatusCode::OK, format!("Hello {}", name))
+    }
 }
 
 #[tokio::main]
@@ -14,9 +20,18 @@ async fn main() {
     tracing_subscriber::fmt::init();
     let app = Router::new()
         .route("/hello/:name", get(hello))
+        .route("/static",
+               get_service(tower_http::services::ServeFile::new("Cargo.toml").precompressed_gzip())
+                   .handle_error(|e: io::Error| async move {
+                       (StatusCode::INTERNAL_SERVER_ERROR, format!("Unhandled internal error: {}", e))
+                   })
+        )
         .layer(
             tower::ServiceBuilder::new()
-                .layer(tower_http::trace::TraceLayer::new_for_http())
+                .layer(
+                    tower_http::trace::TraceLayer::new_for_http()
+                         .make_span_with(tower_http::trace::DefaultMakeSpan::default().include_headers(true)),
+                )
         );
 
     let addr = std::net::SocketAddr::from(([127, 0, 0, 1], 3000));