Skip to content

Adds microsecond logging and also reformats duration to include milliseconds #156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 5, 2022
Merged

Adds microsecond logging and also reformats duration to include milliseconds #156

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9e06ee9
Adds microsecond logging and also reformats duration to include milli…
zainkabani Sep 2, 2022
58d7d9f
fmt
zainkabani Sep 2, 2022
263be94
attempt to fix cd
zainkabani Sep 2, 2022
bfb446d
revert
zainkabani Sep 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 11 additions & 26 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -304,34 +305,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
)
}