mirror of
https://github.com/neondatabase/neon.git
synced 2026-01-05 20:42:54 +00:00
s3_scrubber: remove atty dependency (#5171)
## Problem - https://github.com/neondatabase/neon/security/dependabot/28 ## Summary of changes Remove atty, and remove the `with_ansi` arg to scrubber's stdout logger.
This commit is contained in:
@@ -32,10 +32,10 @@ chrono = { workspace = true, default-features = false, features = ["clock", "ser
|
||||
reqwest = { workspace = true, default-features = false, features = ["rustls-tls", "json"] }
|
||||
aws-config = { workspace = true, default-features = false, features = ["rustls", "credentials-sso"] }
|
||||
|
||||
pageserver = {path="../pageserver"}
|
||||
pageserver = { path = "../pageserver" }
|
||||
|
||||
tracing.workspace = true
|
||||
tracing-subscriber.workspace = true
|
||||
clap.workspace = true
|
||||
tracing-appender = "0.2"
|
||||
histogram = "0.7"
|
||||
histogram = "0.7"
|
||||
|
||||
@@ -19,6 +19,7 @@ use aws_sdk_s3::{Client, Config};
|
||||
|
||||
use reqwest::Url;
|
||||
pub use s3_deletion::S3Deleter;
|
||||
use std::io::IsTerminal;
|
||||
use tokio::io::AsyncReadExt;
|
||||
use tracing::error;
|
||||
use tracing_appender::non_blocking::WorkerGuard;
|
||||
@@ -179,6 +180,7 @@ pub fn init_logging(file_name: &str) -> WorkerGuard {
|
||||
.with_ansi(false)
|
||||
.with_writer(file_writer);
|
||||
let stdout_logs = fmt::Layer::new()
|
||||
.with_ansi(std::io::stdout().is_terminal())
|
||||
.with_target(false)
|
||||
.with_writer(std::io::stdout);
|
||||
tracing_subscriber::registry()
|
||||
|
||||
Reference in New Issue
Block a user