Print server URLs on startup (#1015)

ordinals · Dec 20, 2022 · 9313dc5 · 9313dc5
1 parent 365adb1
commit 9313dc5
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/src/index/updater.rs b/src/index/updater.rs
@@ -78,9 +78,7 @@ impl Updater {
     let mut progress_bar = if cfg!(test)
       || log_enabled!(log::Level::Info)
       || starting_height <= self.height
-      || env::var_os("ORD_DISABLE_PROGRESS_BAR")
-        .map(|value| value.len() > 0)
-        .unwrap_or(false)
+      || integration_test()
     {
       None
     } else {

diff --git a/src/main.rs b/src/main.rs
@@ -102,6 +102,12 @@ const CYCLE_EPOCHS: u64 = 6;
 static INTERRUPTS: AtomicU64 = AtomicU64::new(0);
 static LISTENERS: Mutex<Vec<axum_server::Handle>> = Mutex::new(Vec::new());
 
+fn integration_test() -> bool {
+  env::var_os("ORD_INTEGRATION_TEST")
+    .map(|value| value.len() > 0)
+    .unwrap_or(false)
+}
+
 fn main() {
   env_logger::init();
 

diff --git a/src/subcommand/server.rs b/src/subcommand/server.rs
@@ -212,6 +212,17 @@ impl Server {
       .next()
       .ok_or_else(|| anyhow!("failed to get socket addrs"))?;
 
+    if !integration_test() {
+      eprintln!(
+        "Listening on {}://{addr}",
+        if https_acceptor.is_some() {
+          "https"
+        } else {
+          "http"
+        }
+      );
+    }
+
     Ok(tokio::spawn(async move {
       if let Some(acceptor) = https_acceptor {
         axum_server::Server::bind(addr)

diff --git a/tests/test_server.rs b/tests/test_server.rs
@@ -31,7 +31,7 @@ impl TestServer {
       tempdir.path().display(),
       args.join(" "),
     ).to_args())
-      .env("ORD_DISABLE_PROGRESS_BAR", "1")
+      .env("ORD_INTEGRATION_TEST", "1")
       .current_dir(&tempdir)
       .spawn().unwrap();