From 98848dce7a336446118cc629317208fc2f54a591 Mon Sep 17 00:00:00 2001
From: Sam Andreae <contact@samandreae.com>
Date: Sat, 22 Jun 2024 16:43:42 +0100
Subject: [PATCH] Helper to print or info log depending on log level

---
 aquadoggo/src/http/service.rs    |  9 ++++++---
 aquadoggo/src/lib.rs             |  9 +++++++++
 aquadoggo/src/network/service.rs | 17 +++++++++--------
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/aquadoggo/src/http/service.rs b/aquadoggo/src/http/service.rs
index 855d61193..293a531fc 100644
--- a/aquadoggo/src/http/service.rs
+++ b/aquadoggo/src/http/service.rs
@@ -18,6 +18,7 @@ use crate::http::api::{
     handle_blob_document, handle_blob_view, handle_graphql_playground, handle_graphql_query,
 };
 use crate::http::context::HttpServiceContext;
+use crate::info_or_print;
 use crate::manager::{ServiceReadySender, Shutdown};
 
 /// Route to the GraphQL playground
@@ -74,17 +75,19 @@ pub async fn http_service(
     let builder = if let Ok(builder) = axum::Server::try_bind(&http_address) {
         builder
     } else {
-        println!("HTTP port {http_port} was already taken, try random port instead ..");
+        info_or_print(&format!(
+            "HTTP port {http_port} was already taken, try random port instead .."
+        ));
         axum::Server::try_bind(&SocketAddr::new(IpAddr::V4(Ipv4Addr::UNSPECIFIED), 0))?
     };
 
     let builder = builder.serve(build_server(http_context).into_make_service());
 
     let local_address = builder.local_addr();
-    println!(
+    info_or_print(&format!(
         "Go to http://{}/graphql to use GraphQL playground",
         local_address
-    );
+    ));
 
     builder
         .with_graceful_shutdown(async {
diff --git a/aquadoggo/src/lib.rs b/aquadoggo/src/lib.rs
index db4e38eba..2078957f6 100644
--- a/aquadoggo/src/lib.rs
+++ b/aquadoggo/src/lib.rs
@@ -35,6 +35,7 @@ mod tests;
 pub use crate::api::{ConfigFile, LockFile};
 pub use crate::config::{AllowList, Configuration};
 pub use crate::network::NetworkConfiguration;
+use log::{info, log_enabled, Level};
 pub use node::Node;
 
 /// Init env_logger before the test suite runs to handle logging outputs.
@@ -59,3 +60,11 @@ fn init() {
         let _ = env_logger::builder().is_test(true).try_init();
     }
 }
+
+fn info_or_print(message: &str) {
+    if log_enabled!(Level::Info) || log_enabled!(Level::Debug) || log_enabled!(Level::Trace) {
+        info!("{message}");
+    } else {
+        println!("{message}");
+    }
+}
diff --git a/aquadoggo/src/network/service.rs b/aquadoggo/src/network/service.rs
index a07b11689..8671c1c18 100644
--- a/aquadoggo/src/network/service.rs
+++ b/aquadoggo/src/network/service.rs
@@ -24,7 +24,7 @@ use crate::network::behaviour::{Event, P2pandaBehaviour};
 use crate::network::relay::Relay;
 use crate::network::utils::{dial_known_peer, is_known_peer_address};
 use crate::network::{identity, peers, swarm, utils, ShutdownHandler};
-use crate::NetworkConfiguration;
+use crate::{info_or_print, NetworkConfiguration};
 
 /// Interval at which we attempt to dial known peers and relays.
 const REDIAL_INTERVAL: Duration = Duration::from_secs(20);
@@ -49,7 +49,7 @@ pub async fn network_service(
     let key_pair = identity::to_libp2p_key_pair(&context.key_pair);
     let local_peer_id = key_pair.public().to_peer_id();
 
-    println!("Peer id: {local_peer_id}");
+    info_or_print(&format!("Peer id: {local_peer_id}"));
 
     // The swarm can be initiated with or without "relay" capabilities.
     let mut swarm = if network_config.relay_mode {
@@ -70,10 +70,12 @@ pub async fn network_service(
             .with(Protocol::from(Ipv4Addr::UNSPECIFIED))
             .with(Protocol::Udp(0))
             .with(Protocol::QuicV1);
-        println!(
+
+        info_or_print(&format!(
             "QUIC port {} was already taken, try random port instead ..",
             network_config.quic_port
-        );
+        ));
+
         swarm.listen_on(random_port_addr)?;
     }
 
@@ -184,7 +186,7 @@ impl EventLoop {
                             // Show only one QUIC address during the runtime of the node, otherwise
                             // it might get too spammy
                             if let Some(address) = utils::to_quic_address(&address) {
-                                println!("Node is listening on 0.0.0.0:{}", address.port());
+                                info_or_print(&format!("Node is listening on 0.0.0.0:{}", address.port()));
                                 self.learned_port = true;
                             }
                         }
@@ -308,9 +310,8 @@ impl EventLoop {
                                 .addresses(vec![peer_circuit_address])
                                 .build();
 
-                            match self.swarm.dial(opts) {
-                                Ok(_) => debug!("Dialed peer {}", peer_id),
-                                Err(_) => (),
+                            if self.swarm.dial(opts).is_ok() {
+                                debug!("Dialed peer {}", peer_id)
                             };
                         } else {
                             debug!("Discovered peer from unknown relay node")