From 36cf99d44000b7a5bd87de3aaba8a577596112bf Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Mon, 20 May 2019 22:46:03 -0400
Subject: [PATCH] Better log messages

---
 src/main.rs | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 94c7ab8..0f14333 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -78,7 +78,7 @@ pub fn scan_node(scan_time: Instant, node: SocketAddr) {
 				($recvd_flag: ident, $msg: expr) => { {
 					if state_lock.$recvd_flag {
 						state_lock.fail_reason = AddressState::ProtocolViolation;
-						state_lock.msg = (format!("Updating {} to ProtocolViolation due to dup {}", node, $msg), true);
+						state_lock.msg = (format!("ProtocolViolation due to dup {}", $msg), true);
 						state_lock.$recvd_flag = false;
 						return future::err(());
 					}
@@ -94,29 +94,29 @@ pub fn scan_node(scan_time: Instant, node: SocketAddr) {
 					}
 					let safe_ua = ver.user_agent.replace(|c: char| !c.is_ascii() || c < ' ' || c > '~', "");
 					if (ver.start_height as u64) < state_lock.request.0 {
-						state_lock.msg = (format!("Updating {} to LowBlockCount ({} < {})", node, ver.start_height, state_lock.request.0), true);
+						state_lock.msg = (format!("LowBlockCount ({} < {})", ver.start_height, state_lock.request.0), true);
 						state_lock.fail_reason = AddressState::LowBlockCount;
 						return future::err(());
 					}
 					let min_version = store.get_u64(U64Setting::MinProtocolVersion);
 					if (ver.version as u64) < min_version {
-						state_lock.msg = (format!("Updating {} to LowVersion ({} < {})", node, ver.version, min_version), true);
+						state_lock.msg = (format!("LowVersion ({} < {})", ver.version, min_version), true);
 						state_lock.fail_reason = AddressState::LowVersion;
 						return future::err(());
 					}
 					if ver.services & (1 | (1 << 10)) == 0 {
-						state_lock.msg = (format!("Updating {} to NotFullNode ({}: services {:x})", node, safe_ua, ver.services), true);
+						state_lock.msg = (format!("NotFullNode ({}: services {:x})", safe_ua, ver.services), true);
 						state_lock.fail_reason = AddressState::NotFullNode;
 						return future::err(());
 					}
 					if !store.get_regex(RegexSetting::SubverRegex).is_match(&ver.user_agent) {
-						state_lock.msg = (format!("Updating {} to BadVersion subver {}", node, safe_ua), true);
+						state_lock.msg = (format!("BadVersion subver {}", safe_ua), true);
 						state_lock.fail_reason = AddressState::BadVersion;
 						return future::err(());
 					}
 					check_set_flag!(recvd_version, "version");
 					state_lock.node_services = ver.services;
-					state_lock.msg = (format!("Updating {} to Good: {}", node, safe_ua), false);
+					state_lock.msg = (format!("to Good: {}", safe_ua), false);
 					if let Err(_) = write.try_send(NetworkMessage::Verack) {
 						return future::err(());
 					}
@@ -135,7 +135,7 @@ pub fn scan_node(scan_time: Instant, node: SocketAddr) {
 				NetworkMessage::Addr(addrs) => {
 					if addrs.len() > 1000 {
 						state_lock.fail_reason = AddressState::ProtocolViolation;
-						state_lock.msg = (format!("Updating {} to ProtocolViolation due to oversized addr: {}", node, addrs.len()), true);
+						state_lock.msg = (format!("ProtocolViolation due to oversized addr: {}", addrs.len()), true);
 						state_lock.recvd_addrs = false;
 						return future::err(());
 					}
@@ -154,7 +154,7 @@ pub fn scan_node(scan_time: Instant, node: SocketAddr) {
 					if block.header.bitcoin_hash() != state_lock.request.1 ||
 							!block.check_merkle_root() || !block.check_witness_commitment() {
 						state_lock.fail_reason = AddressState::ProtocolViolation;
-						state_lock.msg = (format!("Updating {} to ProtocolViolation due to bad block", node), true);
+						state_lock.msg = ("ProtocolViolation due to bad block".to_string(), true);
 						return future::err(());
 					}
 					check_set_flag!(recvd_block, "block");
@@ -175,13 +175,13 @@ pub fn scan_node(scan_time: Instant, node: SocketAddr) {
 				state_lock.recvd_addrs && state_lock.recvd_block {
 			let old_state = store.set_node_state(node, AddressState::Good, state_lock.node_services);
 			if old_state != AddressState::Good && state_lock.msg.0 != "" {
-				printer.add_line(state_lock.msg.0.clone() + " from " + old_state.to_str(), state_lock.msg.1);
+				printer.add_line(format!("Updating {} from {} to {}", node, old_state.to_str(), &state_lock.msg.0), state_lock.msg.1);
 			}
 		} else {
 			assert!(state_lock.fail_reason != AddressState::Good);
 			let old_state = store.set_node_state(node, state_lock.fail_reason, 0);
 			if old_state != state_lock.fail_reason && state_lock.msg.0 != "" {
-				printer.add_line(state_lock.msg.0.clone() + " from " + old_state.to_str(), state_lock.msg.1);
+				printer.add_line(format!("Updating {} from {} to {}", node, old_state.to_str(), &state_lock.msg.0), state_lock.msg.1);
 			}
 		}
 		future::ok(())
-- 
2.30.2