From 9e06ee95e727ad8329261ba36f98649fec6e3c3d Mon Sep 17 00:00:00 2001 From: Zain Kabani Date: Fri, 2 Sep 2022 00:37:51 -0400 Subject: [PATCH 1/4] Adds microsecond logging and also reformats duration to include milliseconds --- src/main.rs | 35 +++++++++-------------------------- 1 file changed, 9 insertions(+), 26 deletions(-) diff --git a/src/main.rs b/src/main.rs index a0c1d7cf..aa76829c 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() { @@ -304,34 +305,16 @@ 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) } From 58d7d9fbc5f7dc4334d70c2fc27827084acba2c6 Mon Sep 17 00:00:00 2001 From: Zain Kabani Date: Fri, 2 Sep 2022 00:38:32 -0400 Subject: [PATCH 2/4] fmt --- src/main.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main.rs b/src/main.rs index aa76829c..c7a6b9f0 100644 --- a/src/main.rs +++ b/src/main.rs @@ -305,7 +305,6 @@ async fn main() { /// /// * `duration` - A duration of time fn format_duration(duration: &chrono::Duration) -> String { - let milliseconds = format!("{:0>3}", duration.num_milliseconds() % 1000); let seconds = format!("{:0>2}", duration.num_seconds() % 60); @@ -316,5 +315,8 @@ fn format_duration(duration: &chrono::Duration) -> String { let days = duration.num_days().to_string(); - format!("{}d {}:{}:{}.{}", days, hours, minutes, seconds, milliseconds) + format!( + "{}d {}:{}:{}.{}", + days, hours, minutes, seconds, milliseconds + ) } From 263be94c8707d10f8ebe281651c81be96f4e3050 Mon Sep 17 00:00:00 2001 From: Zain Kabani Date: Fri, 2 Sep 2022 00:55:37 -0400 Subject: [PATCH 3/4] attempt to fix cd --- tests/python/tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/python/tests.py b/tests/python/tests.py index 092fc8cc..3bfb2306 100644 --- a/tests/python/tests.py +++ b/tests/python/tests.py @@ -19,7 +19,7 @@ def pgcat_start(): def pg_cat_send_signal(signal: signal.Signals): for proc in psutil.process_iter(["pid", "name"]): - if "pgcat" == proc.name(): + if proc.is_running() and "pgcat" == proc.name(): os.kill(proc.pid, signal) if signal == signal.SIGTERM: # Returns 0 if pgcat process exists From bfb446d145822a861f6212c3b51301bd2415be4d Mon Sep 17 00:00:00 2001 From: zainkabani <77307340+zainkabani@users.noreply.github.com> Date: Mon, 5 Sep 2022 01:09:23 -0400 Subject: [PATCH 4/4] revert --- tests/python/tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/python/tests.py b/tests/python/tests.py index 3bfb2306..092fc8cc 100644 --- a/tests/python/tests.py +++ b/tests/python/tests.py @@ -19,7 +19,7 @@ def pgcat_start(): def pg_cat_send_signal(signal: signal.Signals): for proc in psutil.process_iter(["pid", "name"]): - if proc.is_running() and "pgcat" == proc.name(): + if "pgcat" == proc.name(): os.kill(proc.pid, signal) if signal == signal.SIGTERM: # Returns 0 if pgcat process exists