Auto merge of #4166 - Turbo87:server-url, r=locks

bin/server: Print HTTP server URL on startup

This makes it easier to click on the URL instead of having to copy-paste the port.

I'm aware that the code comment says "Do not change this line!", but I've adjusted the corresponding test code too... 😉

Author: bors

src/bin/server.rs

@@ -100,7 +100,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     // When the user configures PORT=0 the operative system will allocate a random unused port.
     // This fetches that random port and uses it to display the "listening on port" message later.
-    let actual_port = server.local_addr().port();
+    let addr = server.local_addr();
 
     let server = server.with_graceful_shutdown(async move {
         // Wait for either signal
@@ -116,7 +116,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     // Do not change this line! Removing the line or changing its contents in any way will break
     // the test suite :)
-    println!("listening on port {}", actual_port);
+    println!("Listening at http://{}", addr);
 
     // Creating this file tells heroku to tell nginx that the application is ready
     // to receive traffic.

src/tests/server_binary.rs

@@ -9,6 +9,7 @@ use std::io::{BufRead, BufReader, Read};
 use std::process::{Child, Command, Stdio};
 use std::sync::{mpsc::Sender, Arc};
 use std::time::Duration;
+use url::Url;
 
 const SERVER_BOOT_TIMEOUT_SECONDS: u64 = 30;
 
@@ -195,9 +196,12 @@ where
 
             // If we expect the port number to be logged into this stream, look for it and send it
             // over the channel as soon as it's found.
-            if let Some(port) = &port_send {
-                if let Some(port_str) = line.strip_prefix("listening on port ") {
-                    port.send(port_str.into())
+            if let Some(port_send) = &port_send {
+                if let Some(url) = line.strip_prefix("Listening at ") {
+                    let url = Url::parse(url).unwrap();
+                    let port = url.port().unwrap();
+                    port_send
+                        .send(port.to_string())
                         .expect("failed to send the port to the test thread")
                 }
             }