Skip to content

add --no-color option to disable colors in the terminal #518

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.

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
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions src/cmd_args.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,15 @@ pub struct Args {

#[clap(short='F', long, value_enum, default_value_t=LogFormat::Text, env)]
pub log_format: LogFormat,

#[arg(
short,
long,
default_value_t = false,
env,
help = "disable colors in the log output"
)]
pub no_color: bool,
}

pub fn parse() -> Args {
Expand Down
1 change: 1 addition & 0 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ pub mod config;
pub mod constants;
pub mod dns_cache;
pub mod errors;
pub mod logger;
pub mod messages;
pub mod mirrors;
pub mod plugins;
Expand Down
14 changes: 14 additions & 0 deletions src/logger.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
use crate::cmd_args::{Args, LogFormat};
use tracing_subscriber;

pub fn init(args: &Args) {
let trace_sub = tracing_subscriber::fmt()
.with_max_level(args.log_level)
.with_ansi(!args.no_color);

match args.log_format {
LogFormat::Structured => trace_sub.json().init(),
LogFormat::Debug => trace_sub.pretty().init(),
_ => trace_sub.init(),
};
}
17 changes: 2 additions & 15 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -62,30 +62,17 @@ use std::sync::Arc;
use tokio::sync::broadcast;

use pgcat::cmd_args;
use pgcat::cmd_args::LogFormat;
use pgcat::config::{get_config, reload_config, VERSION};
use pgcat::dns_cache;
use pgcat::logger;
use pgcat::messages::configure_socket;
use pgcat::pool::{ClientServerMap, ConnectionPool};
use pgcat::prometheus::start_metric_server;
use pgcat::stats::{Collector, Reporter, REPORTER};
use tracing_subscriber;

fn main() -> Result<(), Box<dyn std::error::Error>> {
let args = cmd_args::parse();
match args.log_format {
LogFormat::Structured => tracing_subscriber::fmt()
.json()
.with_max_level(args.log_level)
.init(),
LogFormat::Debug => tracing_subscriber::fmt()
.pretty()
.with_max_level(args.log_level)
.init(),
_ => tracing_subscriber::fmt()
.with_max_level(args.log_level)
.init(),
};
logger::init(&args);

info!("Welcome to PgCat! Meow. (Version {})", VERSION);

Expand Down