X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fprinter.rs;h=0d928b0328b1fa21f46621d8c216ccd3a9d5475d;hb=ddbb43272597ab9d0d12ad37528c8450f903d525;hp=10d2150fbf432dfec1582854a0fd7f3e102280ad;hpb=1e90008ac857dbf642addc27cf92ef4d7c76b51d;p=dnsseed-rust

diff --git a/src/printer.rs b/src/printer.rs
index 10d2150..0d928b0 100644
--- a/src/printer.rs
+++ b/src/printer.rs
@@ -1,8 +1,11 @@
+use std::sync::atomic::Ordering;
 use std::collections::LinkedList;
 use std::sync::{Arc, Mutex};
 use std::io::Write;
 
-use crate::datastore::{Store, AddressState, U64Setting, StringSetting};
+use crate::datastore::{Store, AddressState, U64Setting, RegexSetting};
+
+use crate::START_SHUTDOWN;
 
 pub enum Stat {
 	HeaderCount(u64),
@@ -36,6 +39,9 @@ impl Printer {
 				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() {
@@ -44,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?");
@@ -82,43 +71,17 @@ impl Printer {
 						"Minimum protocol version: {} (\"v x\" to change value to x)\n", store.get_u64(U64Setting::MinProtocolVersion)
 						).as_bytes()).expect("stdout broken?");
 				out.write_all(format!(
-						"Subversion match regex: {} (\"s x\" to change value to x)\n", store.get_string(StringSetting::SubverRegex)
+						"Subversion match regex: {} (\"s x\" to change value to x)\n", store.get_regex(RegexSetting::SubverRegex).as_str()
 						).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?");
@@ -129,7 +92,6 @@ impl Printer {
 						"w x: Change the amount of time a node is considered WAS_GOOD after it fails to x from {} (in seconds)\n",
 						store.get_u64(U64Setting::WasGoodTimeout)
 						).as_bytes()).expect("stdout broken?");
-				out.write_all(b"p: Enable/disable updating these stats\n").expect("stdout broken?");
 				out.write_all(b"a x: Scan node x\n").expect("stdout broken?");
 				out.write_all(b"\x1b[s").expect("stdout broken?"); // Save cursor position and provide a blank line before cursor
 				out.write_all(b"\x1b[;H\x1b[2K").expect("stdout broken?");
@@ -144,9 +106,13 @@ 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 err {
+			stats.lines.push_back("\x1b[31m".to_string() + &line + "\x1b[0m");
+		} else {
+			stats.lines.push_back(line);
+		}
 		if stats.lines.len() > 50 {
 			stats.lines.pop_front();
 		}