Multi item log

Cargo.toml

@@ -41,6 +41,7 @@ kv-log-macro = "1.0.4"
 serde = "1.0.102"
 serde_json = "1.0.41"
 route-recognizer = "0.2.0"
+logtest = "2.0.0"
 
 [dev-dependencies]
 async-std = { version = "1.6.0", features = ["unstable", "attributes"] }

src/server.rs

@@ -311,7 +311,7 @@ impl<State: Send + Sync + 'static> Server<State> {
         } else {
             "release"
         };
-        log::info!("Server listening", { address: addr, target: target, tls: tls });
+        log::info!("Server listening on {}", addr, { address: addr, target: target, tls: tls });
 
         let mut incoming = listener.incoming();
         while let Some(stream) = incoming.next().await {
@@ -341,12 +341,8 @@ impl<State: Send + Sync + 'static> Server<State> {
             "release"
         };
 
-        let address = listener
-            .local_addr()
-            .ok()
-            .map(|addr| format!("unix://{:?}", addr));
-
-        log::info!("Server listening", { address: address, target: target, tls: tls });
+        let addr = format!("unix://{:?}", listener.local_addr()?);
+        log::info!("Server listening on {}", addr, { address: addr, target: target, tls: tls });
 
         let mut incoming = listener.incoming();
         while let Some(stream) = incoming.next().await {

tests/log.rs

@@ -0,0 +1,26 @@
+use async_std::prelude::*;
+use std::time::Duration;
+
+mod test_utils;
+
+#[async_std::test]
+async fn start_server_log() {
+    let logger = logtest::start();
+
+    let port = test_utils::find_port().await;
+    let app = tide::new();
+    let res = app
+        .listen(("localhost", port))
+        .timeout(Duration::from_millis(60))
+        .await;
+    assert!(res.is_err());
+
+    let record = logger
+        .filter(|rec| rec.args().starts_with("Server listening"))
+        .next()
+        .unwrap();
+    assert_eq!(
+        record.args(),
+        format!("Server listening on http://[::1]:{}", port)
+    );
+}