From 1cae800ac1e98959a5352a739e7dc4b36881ddbe Mon Sep 17 00:00:00 2001
From: Yuki Kishimoto <yukikishimoto@protonmail.com>
Date: Mon, 2 Dec 2024 18:27:21 +0100
Subject: [PATCH] pool: better logs

Signed-off-by: Yuki Kishimoto <yukikishimoto@protonmail.com>
---
 crates/nostr-relay-pool/src/relay/inner.rs | 47 +++++++++++++++-------
 1 file changed, 33 insertions(+), 14 deletions(-)

diff --git a/crates/nostr-relay-pool/src/relay/inner.rs b/crates/nostr-relay-pool/src/relay/inner.rs
index db161b110..b35e3facf 100644
--- a/crates/nostr-relay-pool/src/relay/inner.rs
+++ b/crates/nostr-relay-pool/src/relay/inner.rs
@@ -728,7 +728,7 @@ impl InnerRelay {
                         // Set ping as just sent
                         ping.just_sent().await;
 
-                        tracing::debug!("Ping '{}' (nonce: {nonce})", self.url);
+                        tracing::trace!("Ping '{}' (nonce: {nonce})", self.url);
                     }
                 }
                 else => break
@@ -763,7 +763,7 @@ impl InnerRelay {
                                         break;
                                     }
 
-                                    tracing::debug!(
+                                    tracing::trace!(
                                         "Pong from '{}' match nonce: {nonce}",
                                         self.url
                                     );
@@ -843,21 +843,38 @@ impl InnerRelay {
                         status,
                         message,
                     } => {
-                        tracing::debug!("Received OK from '{}' for event {event_id}: status={status}, message={message}", self.url);
+                        tracing::debug!(
+                            url = %self.url,
+                            id = %event_id,
+                            status = %status,
+                            msg = %message,
+                            "Received OK."
+                        );
+                    }
+                    RelayMessage::EndOfStoredEvents(id) => {
+                        tracing::debug!(
+                            url = %self.url,
+                            id = %id,
+                            "Received EOSE."
+                        );
                     }
                     RelayMessage::Closed {
-                        subscription_id, ..
+                        subscription_id,
+                        message,
                     } => {
                         tracing::debug!(
-                            "Subscription '{subscription_id}' closed by '{}'",
-                            self.url
+                            url = %self.url,
+                            id = %subscription_id,
+                            msg = %message,
+                            "Subscription closed."
                         );
                         self.subscription_closed(subscription_id).await;
                     }
                     RelayMessage::Auth { challenge } => {
                         tracing::debug!(
-                            "Received '{challenge}' authentication challenge from '{}'",
-                            self.url
+                            url = %self.url,
+                            challenge = %challenge,
+                            "Received AUTH challenge."
                         );
 
                         // Check if NIP42 auto authentication is enabled
@@ -873,13 +890,14 @@ impl InnerRelay {
                                             false,
                                         );
 
-                                        tracing::info!("Authenticated to '{}' relay.", relay.url);
+                                        tracing::info!(url = %relay.url, "Authenticated to relay.");
 
                                         // TODO: ?
                                         if let Err(e) = relay.resubscribe().await {
                                             tracing::error!(
-                                                "Impossible to resubscribe to '{}': {e}",
-                                                relay.url
+                                                url = %relay.url,
+                                                error = %e,
+                                                "Impossible to resubscribe."
                                             );
                                         }
                                     }
@@ -890,8 +908,9 @@ impl InnerRelay {
                                         );
 
                                         tracing::error!(
-                                            "Can't authenticate to '{}' relay: {e}",
-                                            relay.url
+                                            url = %relay.url,
+                                            error = %e,
+                                            "Can't authenticate to relay."
                                         );
                                     }
                                 }
@@ -1461,7 +1480,7 @@ impl InnerRelay {
                         // Unsubscribe
                         this.send_msg(ClientMessage::close(sub_id.clone()))?;
 
-                        tracing::debug!("Subscription {sub_id} auto-closed");
+                        tracing::debug!(id = %sub_id, "Subscription auto-closed.");
                     }
 
                     Ok::<(), Error>(())