Skip to content

remove atty #1960

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

Open
iliana wants to merge 1 commit into
base: main
Choose a base branch
from
Open

remove atty #1960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 2 additions & 23 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ anyhow = "1"
async-channel = "2.5.0"
async-recursion = "1.1.1"
async-trait = "0.1.89"
atty = "0.2.14"
base64 = "0.22.1"
bincode = "1.3"
byte-unit = "5.2.0"
Expand Down
1 change: 0 additions & 1 deletion common/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ edition = "2024"

[dependencies]
anyhow.workspace = true
atty.workspace = true
nix.workspace = true
rustls-pemfile.workspace = true
schemars.workspace = true
Expand Down
4 changes: 2 additions & 2 deletions common/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
use std::fmt;
use std::fs::File;
use std::hash::Hasher;
use std::io::{ErrorKind, Read, Write};
use std::io::{ErrorKind, IsTerminal, Read, Write};
use std::path::Path;

use ErrorKind::NotFound;
Expand Down Expand Up @@ -379,7 +379,7 @@ pub fn build_logger() -> slog::Logger {

/// Build a logger with the specific log level
pub fn build_logger_with_level(level: slog::Level) -> slog::Logger {
let main_drain = if atty::is(atty::Stream::Stdout) {
let main_drain = if std::io::stdout().is_terminal() {
let decorator = slog_term::TermDecorator::new().build();
let drain = slog_term::FullFormat::new(decorator).build().fuse();
slog_async::Async::new(drain)
Expand Down