blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Log build branch/commit on startup (#5626)

This commit is contained in:
Michael Vines 2019-08-23 15:45:55 -07:00 committed by GitHub
parent 0ffe7a9c8f
commit bb80116605
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
validator/src/main.rs
View File

@ -1,6 +1,6 @@
use bzip2::bufread::BzDecoder; use bzip2::bufread::BzDecoder;
use clap::{crate_description, crate_name, crate_version, value_t, value_t_or_exit, App, Arg}; use clap::{crate_description, crate_name, crate_version, value_t, value_t_or_exit, App, Arg};
use console::Emoji; use console::{style, Emoji};
use indicatif::{ProgressBar, ProgressStyle}; use indicatif::{ProgressBar, ProgressStyle};
use log::*; use log::*;
use solana_client::rpc_client::RpcClient; use solana_client::rpc_client::RpcClient;
@ -488,11 +488,21 @@ fn main() {
let (signer_service, signer_addr) = LocalVoteSignerService::new(dynamic_port_range); let (signer_service, signer_addr) = LocalVoteSignerService::new(dynamic_port_range);
(Some(signer_service), signer_addr) (Some(signer_service), signer_addr)
}; };
let init_complete_file = matches.value_of("init_complete_file"); let init_complete_file = matches.value_of("init_complete_file");
let verify_ledger = !matches.is_present("skip_ledger_verify");
validator_config.blockstream_unix_socket = matches validator_config.blockstream_unix_socket = matches
.value_of("blockstream_unix_socket") .value_of("blockstream_unix_socket")
.map(PathBuf::from); .map(PathBuf::from);
println!(
"{} version {} (branch={}, commit={})",
style(crate_name!()).bold(),
crate_version!(),
option_env!("CI_BRANCH").unwrap_or("unknown"),
option_env!("CI_COMMIT").unwrap_or("unknown")
);
if let Some(ref entrypoint_addr) = cluster_entrypoint { if let Some(ref entrypoint_addr) = cluster_entrypoint {
let expected_genesis_blockhash = initialize_ledger_path( let expected_genesis_blockhash = initialize_ledger_path(
entrypoint_addr, entrypoint_addr,
@ -527,8 +537,6 @@ fn main() {
node.info.rpc_pubsub = SocketAddr::new(gossip_addr.ip(), port_number + 1); node.info.rpc_pubsub = SocketAddr::new(gossip_addr.ip(), port_number + 1);
}; };
let verify_ledger = !matches.is_present("skip_ledger_verify");
let validator = Validator::new( let validator = Validator::new(
node, node,
&Arc::new(keypair), &Arc::new(keypair),