X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fprinter.rs;h=352dc7e4d895852f8d293561c8c98a65358e3884;hb=0d474196b752d00a80209535b60c23d35a492745;hp=f51fee55bb116b9e49dd9c5b4f9273061b9a291e;hpb=8808d87877909d7d4f97d7ff320d8d165ece5800;p=dnsseed-rust

diff --git a/src/printer.rs b/src/printer.rs
index f51fee5..352dc7e 100644
--- a/src/printer.rs
+++ b/src/printer.rs
@@ -34,14 +34,14 @@ impl Printer {
 		std::thread::spawn(move || {
 			loop {
 				std::thread::sleep(std::time::Duration::from_secs(1));
-				if START_SHUTDOWN.load(Ordering::Relaxed) {
-					break;
-				}
 
 				let stdout = std::io::stdout();
 				let mut out = stdout.lock();
 
 				let stats = thread_arc.lock().unwrap();
+				if START_SHUTDOWN.load(Ordering::Relaxed) && stats.connection_count == 0 {
+					break;
+				}
 
 				out.write_all(b"\x1b[2J\x1b[;H\n").expect("stdout broken?");
 				for line in stats.lines.iter() {
@@ -50,28 +50,11 @@ impl Printer {
 				}
 
 				out.write_all(b"\nNode counts by status:\n").expect("stdout broken?");
-				out.write_all(format!("Untested:               {}\n", store.get_node_count(AddressState::Untested)
-						).as_bytes()).expect("stdout broken?");
-				out.write_all(format!("Low Block Count:        {}\n", store.get_node_count(AddressState::LowBlockCount)
-						).as_bytes()).expect("stdout broken?");
-				out.write_all(format!("High Block Count:       {}\n", store.get_node_count(AddressState::HighBlockCount)
-						).as_bytes()).expect("stdout broken?");
-				out.write_all(format!("Low Version:            {}\n", store.get_node_count(AddressState::LowVersion)
-						).as_bytes()).expect("stdout broken?");
-				out.write_all(format!("Bad Version:            {}\n", store.get_node_count(AddressState::BadVersion)
-						).as_bytes()).expect("stdout broken?");
-				out.write_all(format!("Not Full Node:          {}\n", store.get_node_count(AddressState::NotFullNode)
-						).as_bytes()).expect("stdout broken?");
-				out.write_all(format!("Protocol Violation:     {}\n", store.get_node_count(AddressState::ProtocolViolation)
-						).as_bytes()).expect("stdout broken?");
-				out.write_all(format!("Timeout:                {}\n", store.get_node_count(AddressState::Timeout)
-						).as_bytes()).expect("stdout broken?");
-				out.write_all(format!("Timeout During Request: {}\n", store.get_node_count(AddressState::TimeoutDuringRequest)
-						).as_bytes()).expect("stdout broken?");
-				out.write_all(format!("Good:                   {}\n", store.get_node_count(AddressState::Good)
-						).as_bytes()).expect("stdout broken?");
-				out.write_all(format!("WasGood:                {}\n", store.get_node_count(AddressState::WasGood)
-						).as_bytes()).expect("stdout broken?");
+				for i in 0..AddressState::get_count() {
+					out.write_all(format!("{:22}: {}\n", AddressState::from_num(i).unwrap().to_str(),
+							store.get_node_count(AddressState::from_num(i).unwrap())
+							).as_bytes()).expect("stdout broken?");
+				}
 
 				out.write_all(format!(
 						"\nCurrent connections open/in progress: {}\n", stats.connection_count).as_bytes()).expect("stdout broken?");
@@ -92,39 +75,13 @@ impl Printer {
 						).as_bytes()).expect("stdout broken?");
 
 				out.write_all(b"\nRetry times (in seconds):\n").expect("stdout broken?");
-				out.write_all(format!(
-						"Untested:               {}\n", store.get_u64(U64Setting::RescanInterval(AddressState::Untested))
-						).as_bytes()).expect("stdout broken?");
-				out.write_all(format!(
-						"Low Block Count:        {}\n", store.get_u64(U64Setting::RescanInterval(AddressState::LowBlockCount))
-						).as_bytes()).expect("stdout broken?");
-				out.write_all(format!(
-						"High Block Count        {}\n", store.get_u64(U64Setting::RescanInterval(AddressState::HighBlockCount))
-						).as_bytes()).expect("stdout broken?");
-				out.write_all(format!(
-						"Low Version:            {}\n", store.get_u64(U64Setting::RescanInterval(AddressState::LowVersion))
-						).as_bytes()).expect("stdout broken?");
-				out.write_all(format!(
-						"Bad Version:            {}\n", store.get_u64(U64Setting::RescanInterval(AddressState::BadVersion))
-						).as_bytes()).expect("stdout broken?");
-				out.write_all(format!(
-						"Not Full Node:          {}\n", store.get_u64(U64Setting::RescanInterval(AddressState::NotFullNode))
-						).as_bytes()).expect("stdout broken?");
-				out.write_all(format!(
-						"Protocol Violation:     {}\n", store.get_u64(U64Setting::RescanInterval(AddressState::ProtocolViolation))
-						).as_bytes()).expect("stdout broken?");
-				out.write_all(format!(
-						"Timeout:                {}\n", store.get_u64(U64Setting::RescanInterval(AddressState::Timeout))
-						).as_bytes()).expect("stdout broken?");
-				out.write_all(format!(
-						"Timeout During Request: {}\n", store.get_u64(U64Setting::RescanInterval(AddressState::TimeoutDuringRequest))
-						).as_bytes()).expect("stdout broken?");
-				out.write_all(format!(
-						"Good:                   {}\n", store.get_u64(U64Setting::RescanInterval(AddressState::Good))
-						).as_bytes()).expect("stdout broken?");
-				out.write_all(format!(
-						"Was Good:               {}\n", store.get_u64(U64Setting::RescanInterval(AddressState::WasGood))
-						).as_bytes()).expect("stdout broken?");
+				for i in 0..AddressState::get_count() {
+					let scan_secs = store.get_u64(U64Setting::RescanInterval(AddressState::from_num(i).unwrap()));
+					out.write_all(format!(
+							"{:22} ({:2}): {:5} (ie {} hrs, {} min)\n", AddressState::from_num(i).unwrap().to_str(), i,
+							scan_secs, scan_secs / 60 / 60, (scan_secs / 60) % 60,
+							).as_bytes()).expect("stdout broken?");
+				}
 
 				out.write_all(b"\nCommands:\n").expect("stdout broken?");
 				out.write_all(b"q: quit\n").expect("stdout broken?");
@@ -149,10 +106,14 @@ impl Printer {
 		}
 	}
 
-	pub fn add_line(&self, line: String, _err: bool) {
+	pub fn add_line(&self, line: String, err: bool) {
 		let mut stats = self.stats.lock().unwrap();
-		stats.lines.push_back(line);
-		if stats.lines.len() > 50 {
+		if err {
+			stats.lines.push_back("\x1b[31m".to_string() + &line + "\x1b[0m");
+		} else {
+			stats.lines.push_back(line);
+		}
+		if stats.lines.len() > 75 {
 			stats.lines.pop_front();
 		}
 	}