actions/cargo-binstall
1
0
Fork 0
mirror of https://github.com/cargo-bins/cargo-binstall.git synced 2025-05-06 12:10:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Enable coloring in console log (#528)

Browse source 
* Enable feat ansi of dep tracing-subscriber
* Rm use of `tracing_appender::non_blocking`
  since `cargo-binstall` is so simple that it doesn't need it.
* Use `tracing::{error, info}` in `MainExit::report`
* Use `tracing::{error, warn}` in `BinstallError::report`
* Add dep supports-color v1.3.1 to crates/bin
* Enable ansi of `tracing_subscriber::fmt` if stdout supports it

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
This commit is contained in:
Jiahao XU 2022-11-13 20:45:19 +11:00 • committed by GitHub
parent 4e875874b6
commit 90495b35d8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 51 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

45
crates/bin/src/logging.rs
View file

@ -1,14 +1,14 @@
use std::{cmp::min, io, iter::repeat};
use std::{cmp::min, iter::repeat};
use log::{LevelFilter, Log, STATIC_MAX_LEVEL};
use once_cell::sync::Lazy;
use supports_color::{on as supports_color_on_stream, Stream::Stdout};
use tracing::{
callsite::Callsite,
dispatcher, field,
subscriber::{self, set_global_default},
Event, Level, Metadata,
};
use tracing_appender::non_blocking::{NonBlockingBuilder, WorkerGuard};
use tracing_core::{identify_callsite, metadata::Kind, subscriber::Subscriber};
use tracing_log::AsTrace;
use tracing_subscriber::{filter::targets::Targets, fmt::fmt, layer::SubscriberExt};
@ -131,7 +131,7 @@ impl Log for Logger {
fn flush(&self) {}
}
pub fn logging(args: &Args) -> WorkerGuard {
pub fn logging(args: &Args) {
// Calculate log_level
let log_level = min(args.log_level, STATIC_MAX_LEVEL);
@ -141,31 +141,30 @@ pub fn logging(args: &Args) -> WorkerGuard {
// Forward log to tracing
Logger::init(log_level);
// Setup non-blocking stdout
let (non_blocking, guard) = NonBlockingBuilder::default()
.lossy(false)
.finish(io::stdout());
// Build fmt subscriber
let log_level = log_level.as_trace();
let subscriber_builder = fmt().with_writer(non_blocking).with_max_level(log_level);
let subscriber_builder = fmt().with_max_level(log_level);
let subscriber: Box<dyn Subscriber + Send + Sync> = if args.json_output {
Box::new(subscriber_builder.json().finish())
} else {
Box::new(
subscriber_builder
.compact()
// Disable time, target, file, line_num, thread name/ids to make the
// output more readable
.without_time()
.with_target(false)
.with_file(false)
.with_line_number(false)
.with_thread_names(false)
.with_thread_ids(false)
.finish(),
)
// Disable time, target, file, line_num, thread name/ids to make the
// output more readable
let subscriber_builder = subscriber_builder
.without_time()
.with_target(false)
.with_file(false)
.with_line_number(false)
.with_thread_names(false)
.with_thread_ids(false);
// subscriber_builder defaults to write to io::stdout(),
// so tests whether it supports color.
let stdout_supports_color = supports_color_on_stream(Stdout)
.map(|color_level| color_level.has_basic)
.unwrap_or_default();
Box::new(subscriber_builder.with_ansi(stdout_supports_color).finish())
};
// Builder layer for filtering
@ -178,6 +177,4 @@ pub fn logging(args: &Args) -> WorkerGuard {
// Setup global subscriber
set_global_default(subscriber).unwrap();
guard
}