conduit-axum: Add router argument to Server::serve() fn

Author: Turbo87

conduit-axum/examples/server.rs

@@ -12,10 +12,12 @@ use std::thread::sleep;
 async fn main() {
     tracing_subscriber::fmt::init();
 
+    let router = axum::Router::new();
+
     let app = build_conduit_handler();
     let addr = ([127, 0, 0, 1], 12345).into();
 
-    Server::serve(&addr, app).await;
+    Server::serve(&addr, router, app).await;
 }
 
 fn build_conduit_handler() -> impl Handler {

conduit-axum/src/lib.rs

@@ -19,9 +19,11 @@
 //!
 //! #[tokio::main]
 //! async fn main() {
+//!     let router = axum::Router::new();
+//!
 //!     let app = build_conduit_handler();
 //!     let addr = ([127, 0, 0, 1], 12345).into();
-//!     let server = Server::serve(&addr, app);
+//!     let server = Server::serve(&addr, router, app);
 //!
 //!     server.await;
 //! }

conduit-axum/src/server.rs

@@ -14,8 +14,12 @@ impl Server {
     /// `tokio::Runtime` it is not possible to furter configure the `hyper::Server`.  If more
     /// control, such as configuring a graceful shutdown is necessary, then call
     /// `Service::from_blocking` instead.
-    pub fn serve<H: conduit::Handler>(addr: &SocketAddr, handler: H) -> impl Future {
-        let router = axum::Router::new().conduit_fallback(handler);
+    pub fn serve<H: conduit::Handler>(
+        addr: &SocketAddr,
+        router: axum::Router,
+        handler: H,
+    ) -> impl Future {
+        let router = router.conduit_fallback(handler);
         let make_service = router.into_make_service_with_connect_info::<SocketAddr>();
 
         hyper::Server::bind(addr).serve(make_service)