From 7805c730e8ead9cd421f45d4720fd7f4062675e6 Mon Sep 17 00:00:00 2001
From: Tyler Murphy <tylermurphy534@gmail.com>
Date: Sun, 29 Jan 2023 00:35:06 -0500
Subject: no mass rerendering html plus logging fix

---
 src/main.rs | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

(limited to 'src/main.rs')

diff --git a/src/main.rs b/src/main.rs
index cd137b9..20627d7 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,11 +1,11 @@
 use axum::{
     body::HttpBody,
-    extract::ConnectInfo,
     http::{Request, StatusCode},
     middleware::{self, Next},
     response::Response,
     Extension, RequestExt, Router,
 };
+use axum_client_ip::ClientIp;
 use std::{net::SocketAddr, process::exit};
 use tower_cookies::CookieManagerLayer;
 use tracing::{error, info, metadata::LevelFilter};
@@ -40,18 +40,11 @@ async fn log<B>(mut req: Request<B>, next: Next<B>) -> Response
 where
     B: Send + Sync + 'static + HttpBody,
 {
-    let Ok(ConnectInfo(info)) = req.extract_parts::<ConnectInfo<SocketAddr>>().await else {
+    let Ok(ClientIp(ip)) = req.extract_parts::<ClientIp>().await else {
         return next.run(req).await
     };
 
-    console::log(
-        info.ip(),
-        req.method().clone(),
-        req.uri().clone(),
-        None,
-        None,
-    )
-    .await;
+    console::log(ip, req.method().clone(), req.uri().clone(), None, None).await;
 
     next.run(req).await
 }
@@ -80,9 +73,9 @@ async fn main() {
 
     let app = Router::new()
         .fallback(not_found)
-        .nest("/", pages::router())
         .layer(middleware::from_fn(log))
         .layer(middleware::from_fn(serve))
+        .nest("/", pages::router())
         .nest(
             "/api/auth",
             auth::router().layer(Extension(RouterURI("/api/auth"))),
-- 
cgit v1.2.3-freya