From 6a9a4db648710a195e63e7e459825beb1ff7e6d3 Mon Sep 17 00:00:00 2001
From: zainkabani <77307340+zainkabani@users.noreply.github.com>
Date: Mon, 5 Sep 2022 04:21:27 -0400
Subject: [PATCH] Adds microsecond logging and also reformats duration to
 include milliseconds (#156)

* Adds microsecond logging and also reformats duration to include milliseconds

* fmt

* attempt to fix cd

* revert
---
 src/main.rs | 37 +++++++++++--------------------------
 1 file changed, 11 insertions(+), 26 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index a6075ef..0d4bd37 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -74,7 +74,8 @@ use crate::stats::{Collector, Reporter, REPORTER};
 
 #[tokio::main(worker_threads = 4)]
 async fn main() {
-    env_logger::init();
+    env_logger::builder().format_timestamp_micros().init();
+
     info!("Welcome to PgCat! Meow. (Version {})", VERSION);
 
     if !query_router::QueryRouter::setup() {
@@ -307,34 +308,18 @@ async fn main() {
 ///
 /// * `duration` - A duration of time
 fn format_duration(duration: &chrono::Duration) -> String {
-    let seconds = {
-        let seconds = duration.num_seconds() % 60;
-        if seconds < 10 {
-            format!("0{}", seconds)
-        } else {
-            format!("{}", seconds)
-        }
-    };
+    let milliseconds = format!("{:0>3}", duration.num_milliseconds() % 1000);
 
-    let minutes = {
-        let minutes = duration.num_minutes() % 60;
-        if minutes < 10 {
-            format!("0{}", minutes)
-        } else {
-            format!("{}", minutes)
-        }
-    };
+    let seconds = format!("{:0>2}", duration.num_seconds() % 60);
 
-    let hours = {
-        let hours = duration.num_hours() % 24;
-        if hours < 10 {
-            format!("0{}", hours)
-        } else {
-            format!("{}", hours)
-        }
-    };
+    let minutes = format!("{:0>2}", duration.num_minutes() % 60);
+
+    let hours = format!("{:0>2}", duration.num_hours() % 24);
 
     let days = duration.num_days().to_string();
 
-    format!("{}d {}:{}:{}", days, hours, minutes, seconds)
+    format!(
+        "{}d {}:{}:{}.{}",
+        days, hours, minutes, seconds, milliseconds
+    )
 }