Skip to content
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
3 changes: 0 additions & 3 deletions Cargo.lock

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
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ vm-attest = { git = "https://github.com/oxidecomputer/vm-attest", rev = "deaf020
acpi_tables = { git = 'https://github.com/oxidecomputer/acpi_tables.git', tag = "v0.2.1-oxide.1" }
anyhow = "1.0"
async-trait = "0.1.88"
atty = "0.2.14"
backoff = "0.4.0"
backtrace = "0.3.66"
base64 = "0.21"
Expand Down
1 change: 0 additions & 1 deletion bin/mock-server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ doctest = false
test = false

[dependencies]
atty.workspace = true
anyhow.workspace = true
clap = { workspace = true, features = ["derive"] }
base64.workspace = true
Expand Down
3 changes: 2 additions & 1 deletion bin/mock-server/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.

use std::io::IsTerminal;
use std::net::SocketAddr;
use std::path::PathBuf;
use std::sync::Arc;
Expand Down Expand Up @@ -34,7 +35,7 @@ enum Args {
}

fn build_logger() -> 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
1 change: 0 additions & 1 deletion bin/propolis-server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ doctest = false
test = false

[dependencies]
atty.workspace = true
anyhow.workspace = true
async-trait.workspace = true
bit_field.workspace = true
Expand Down
3 changes: 2 additions & 1 deletion bin/propolis-server/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// file, You can obtain one at https://mozilla.org/MPL/2.0/.

use std::fmt;
use std::io::IsTerminal;
use std::net::{IpAddr, Ipv6Addr, SocketAddr};
use std::path::PathBuf;
use std::str::FromStr;
Expand Down Expand Up @@ -203,7 +204,7 @@ fn run_server(
fn build_logger(level: slog::Level) -> slog::Logger {
use slog::Drain;

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
1 change: 0 additions & 1 deletion bin/propolis-standalone/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ doctest = false

[dependencies]
anyhow.workspace = true
atty.workspace = true
bhyve_api.workspace = true
clap = { workspace = true, features = ["derive", "env"] }
cpuid_utils.workspace = true
Expand Down
4 changes: 2 additions & 2 deletions bin/propolis-standalone/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
use std::collections::{BTreeMap, VecDeque};
use std::fmt;
use std::fs::File;
use std::io::{Error, ErrorKind, Result};
use std::io::{Error, ErrorKind, IsTerminal, Result};
use std::path::Path;
use std::process::ExitCode;
use std::sync::atomic::{AtomicUsize, Ordering};
Expand Down Expand Up @@ -823,7 +823,7 @@ fn open_bootrom(path: &str) -> Result<(File, usize)> {
}

fn build_log(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::CompactFormat::new(decorator).build().fuse();
slog_async::Async::new(drain)
Expand Down
2 changes: 1 addition & 1 deletion phd-tests/framework/src/disk/crucible.rs
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ impl Inner {
];

// NOTE: `log_format` is ignored here because Crucible determines
// Bunyan or plain formatting based on `atty::is()`. In practice
// Bunyan or plain formatting based on `is_terminal()`. In practice
// this is fine, and matches what we want right now, but it might be
// nice to connect this more directly to the output desire expressed
// by the test runner.
Expand Down
Loading