From c7f2d58ba550850f44584a32d617a86bf0f2f642 Mon Sep 17 00:00:00 2001 From: Daniel Cadenas Date: Fri, 23 Aug 2024 14:43:45 -0300 Subject: [PATCH] More informative, compact logs --- src/follows_differ.rs | 68 ++++++++++++++++++++++++------------------- 1 file changed, 38 insertions(+), 30 deletions(-) diff --git a/src/follows_differ.rs b/src/follows_differ.rs index 37a91f8..c8b5dee 100644 --- a/src/follows_differ.rs +++ b/src/follows_differ.rs @@ -134,34 +134,6 @@ where self.follow_change_sender.send(follow_change)?; Ok(()) } - - fn log_results( - &self, - follower: PublicKey, - event_created_at: Timestamp, - followed_counter: usize, - unfollowed_counter: usize, - unchanged: usize, - first_seen: bool, - ) { - if first_seen && followed_counter > 0 { - info!( - "Pubkey {}: date {}, {} followed, new follows list", - follower, - event_created_at.to_human_datetime(), - followed_counter, - ); - } else if followed_counter > 0 || unfollowed_counter > 0 { - info!( - "Pubkey {}: date {}, {} followed, {} unfollowed, {} unchanged", - follower, - event_created_at.to_human_datetime(), - followed_counter, - unfollowed_counter, - unchanged - ); - } - } } impl WorkerTask> for FollowsDiffer @@ -198,19 +170,55 @@ where .process_follows_diff(follows_diff, &follower, event_created_at) .await?; - self.log_results( + if let Some(log_line) = log_line( follower, event.created_at, followed_counter, unfollowed_counter, unchanged, first_seen, - ); + maybe_latest_stored_updated_at, + ) { + info!("{}", log_line); + } Ok(()) } } +fn log_line( + follower: PublicKey, + event_created_at: Timestamp, + followed_counter: usize, + unfollowed_counter: usize, + unchanged: usize, + first_seen: bool, + maybe_latest_stored_updated_at: Option, +) -> Option { + let timestamp_diff = if let Some(latest_stored_updated_at) = maybe_latest_stored_updated_at { + format!( + "[{}->{}]", + latest_stored_updated_at.to_human_datetime(), + event_created_at.to_human_datetime() + ) + } else { + format!("[new->{}]", event_created_at.to_human_datetime()) + }; + + if first_seen && followed_counter > 0 { + return Some(format!( + "Pubkey {}: date {}, {} followed, new follows list", + follower, timestamp_diff, followed_counter, + )); + } else if followed_counter > 0 || unfollowed_counter > 0 { + return Some(format!( + "Pubkey {}: date {}, {} followed, {} unfollowed, {} unchanged", + follower, timestamp_diff, followed_counter, unfollowed_counter, unchanged, + )); + } + None +} + fn convert_timestamp(timestamp: u64) -> Result> { DateTime::::from_timestamp(timestamp as i64, 0).ok_or("Invalid timestamp".into()) }