gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Unify logging initialization

Browse Source
This commit is contained in:
Michael Vines
2018-07-27 21:37:53 -07:00
parent 79924e407c
commit fae9fff24c
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/bin/bench-tps.rs
View File

@ -1,6 +1,5 @@
extern crate bincode; extern crate bincode;
extern crate clap; extern crate clap;
extern crate env_logger;
extern crate influx_db_client; extern crate influx_db_client;
extern crate rayon; extern crate rayon;
extern crate serde_json; extern crate serde_json;
@ -14,6 +13,7 @@ use solana::crdt::{Crdt, NodeInfo};
use solana::drone::{DroneRequest, DRONE_PORT}; use solana::drone::{DroneRequest, DRONE_PORT};
use solana::fullnode::Config; use solana::fullnode::Config;
use solana::hash::Hash; use solana::hash::Hash;
use solana::logger;
use solana::metrics; use solana::metrics;
use solana::nat::{udp_public_bind, udp_random_bind, UdpSocketPair}; use solana::nat::{udp_public_bind, udp_random_bind, UdpSocketPair};
use solana::ncp::Ncp; use solana::ncp::Ncp;
@ -326,7 +326,7 @@ fn compute_and_report_stats(
} }
fn main() { fn main() {
env_logger::init(); logger::setup();
metrics::set_panic_hook("bench-tps"); metrics::set_panic_hook("bench-tps");
let mut threads = 4usize; let mut threads = 4usize;
let mut num_nodes = 1usize; let mut num_nodes = 1usize;

4
src/bin/drone.rs
View File

@ -1,6 +1,5 @@
extern crate bincode; extern crate bincode;
extern crate clap; extern crate clap;
extern crate env_logger;
extern crate serde_json; extern crate serde_json;
extern crate solana; extern crate solana;
extern crate tokio; extern crate tokio;
@ -12,6 +11,7 @@ use clap::{App, Arg};
use solana::crdt::NodeInfo; use solana::crdt::NodeInfo;
use solana::drone::{Drone, DroneRequest, DRONE_PORT}; use solana::drone::{Drone, DroneRequest, DRONE_PORT};
use solana::fullnode::Config; use solana::fullnode::Config;
use solana::logger;
use solana::metrics::set_panic_hook; use solana::metrics::set_panic_hook;
use solana::signature::read_keypair; use solana::signature::read_keypair;
use std::fs::File; use std::fs::File;
@ -23,7 +23,7 @@ use tokio::prelude::*;
use tokio_codec::{BytesCodec, Decoder}; use tokio_codec::{BytesCodec, Decoder};
fn main() { fn main() {
env_logger::init(); logger::setup();
set_panic_hook("drone"); set_panic_hook("drone");
let matches = App::new("drone") let matches = App::new("drone")
.arg( .arg(

4
src/bin/fullnode.rs
View File

@ -1,5 +1,4 @@
extern crate clap; extern crate clap;
extern crate env_logger;
extern crate getopts; extern crate getopts;
extern crate log; extern crate log;
extern crate serde_json; extern crate serde_json;
@ -8,6 +7,7 @@ extern crate solana;
use clap::{App, Arg}; use clap::{App, Arg};
use solana::crdt::{NodeInfo, TestNode}; use solana::crdt::{NodeInfo, TestNode};
use solana::fullnode::{Config, FullNode, LedgerFile}; use solana::fullnode::{Config, FullNode, LedgerFile};
use solana::logger;
use solana::metrics::set_panic_hook; use solana::metrics::set_panic_hook;
use solana::service::Service; use solana::service::Service;
use solana::signature::{KeyPair, KeyPairUtil}; use solana::signature::{KeyPair, KeyPairUtil};
@ -17,7 +17,7 @@ use std::process::exit;
//use std::time::Duration; //use std::time::Duration;
fn main() -> () { fn main() -> () {
env_logger::init(); logger::setup();
set_panic_hook("fullnode"); set_panic_hook("fullnode");
let matches = App::new("fullnode") let matches = App::new("fullnode")
.arg( .arg(

4
src/bin/wallet.rs
View File

@ -3,7 +3,6 @@ extern crate bincode;
extern crate bs58; extern crate bs58;
extern crate clap; extern crate clap;
extern crate dirs; extern crate dirs;
extern crate env_logger;
extern crate serde_json; extern crate serde_json;
extern crate solana; extern crate solana;
@ -12,6 +11,7 @@ use clap::{App, Arg, SubCommand};
use solana::crdt::NodeInfo; use solana::crdt::NodeInfo;
use solana::drone::{DroneRequest, DRONE_PORT}; use solana::drone::{DroneRequest, DRONE_PORT};
use solana::fullnode::Config; use solana::fullnode::Config;
use solana::logger;
use solana::signature::{read_keypair, KeyPair, KeyPairUtil, PublicKey, Signature}; use solana::signature::{read_keypair, KeyPair, KeyPairUtil, PublicKey, Signature};
use solana::thin_client::ThinClient; use solana::thin_client::ThinClient;
use std::error; use std::error;
@ -350,7 +350,7 @@ fn request_airdrop(
} }
fn main() -> Result<(), Box<error::Error>> { fn main() -> Result<(), Box<error::Error>> {
env_logger::init(); logger::setup();
let config = parse_args()?; let config = parse_args()?;
let mut client = mk_client(&config.leader)?; let mut client = mk_client(&config.leader)?;
process_command(&config, &mut client) process_command(&config, &mut client)