Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.
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
1 change: 0 additions & 1 deletion Cargo.lock

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

2 changes: 1 addition & 1 deletion gossip/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ homepage = "https://solana.com/"

[dependencies]
clap = "2.33.0"
env_logger = "0.6.2"
solana = { path = "../core", version = "0.18.0-pre0" }
solana-client = { path = "../client", version = "0.18.0-pre0" }
solana-logger = { path = "../logger", version = "0.18.0-pre0" }
solana-netutil = { path = "../netutil", version = "0.18.0-pre0" }
solana-sdk = { path = "../sdk", version = "0.18.0-pre0" }

Expand Down
2 changes: 1 addition & 1 deletion gossip/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ fn pubkey_validator(pubkey: String) -> Result<(), String> {
}

fn main() -> Result<(), Box<dyn error::Error>> {
env_logger::Builder::from_env(env_logger::Env::new().default_filter_or("solana=info")).init();
solana_logger::setup_with_filter("solana=info");

let mut entrypoint_addr = SocketAddr::from(([127, 0, 0, 1], 8001));
let entrypoint_string = entrypoint_addr.to_string();
Expand Down
9 changes: 6 additions & 3 deletions logger/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,14 @@ use std::sync::Once;

static INIT: Once = Once::new();

/// Setup function that is only run once, even if called multiple times.
pub fn setup() {
pub fn setup_with_filter(filter: &str) {
INIT.call_once(|| {
env_logger::Builder::from_default_env()
env_logger::Builder::from_env(env_logger::Env::new().default_filter_or(filter))
.default_format_timestamp_nanos(true)
.init();
});
}

pub fn setup() {
setup_with_filter("error");
}
1 change: 0 additions & 1 deletion multinode-demo/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ solana_ledger_tool=$(solana_program ledger-tool)
solana_wallet=$(solana_program wallet)
solana_replicator=$(solana_program replicator)

export RUST_LOG=${RUST_LOG:-solana=info} # if RUST_LOG is unset, default to info
export RUST_BACKTRACE=1

# shellcheck source=scripts/configure-metrics.sh
Expand Down
2 changes: 1 addition & 1 deletion validator/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ fn port_range_validator(port_range: String) -> Result<(), String> {
}

fn main() {
solana_logger::setup();
solana_logger::setup_with_filter("solana=info");
solana_metrics::set_panic_hook("validator");

let default_dynamic_port_range =
Expand Down