Validator/replicator metrics host id is no longer set by bash (#5755)

automerge
This commit is contained in:
Michael Vines
2019-08-30 15:33:30 -07:00
committed by Grimes
parent 643d0b0868
commit 6089c8030b
8 changed files with 47 additions and 40 deletions

View File

@ -403,6 +403,7 @@ fn main() {
} else {
Keypair::new()
};
let voting_keypair = if let Some(identity) = matches.value_of("voting_keypair") {
read_keypair(identity).unwrap_or_else(|err| {
eprintln!("{}: Unable to open keypair file: {}", err, identity);
@ -522,6 +523,7 @@ fn main() {
option_env!("CI_BRANCH").unwrap_or("unknown"),
option_env!("CI_COMMIT").unwrap_or("unknown")
);
solana_metrics::set_host_id(keypair.pubkey().to_string());
if let Some(ref entrypoint_addr) = cluster_entrypoint {
let expected_genesis_blockhash = initialize_ledger_path(