Dont ever run two scan threads

[dnsseed-rust] / src / main.rs

diff --git a/src/main.rs b/src/main.rs
index 0f14333a75058b6f2a23e7cede3f6afb45e6778d..3086731dc96f71946fc7f59b5cf8c806070be185 100644 (file)
--- a/src/main.rs
+++ b/src/main.rs
@@ -33,6 +33,7 @@ static mut HEIGHT_MAP: Option<Box<Mutex<HashMap<u64, sha256d::Hash>>>> = None;
 static mut DATA_STORE: Option<Box<Store>> = None;
 static mut PRINTER: Option<Box<Printer>> = None;
 pub static START_SHUTDOWN: AtomicBool = AtomicBool::new(false);
+static SCANNING: AtomicBool = AtomicBool::new(false);
 
 struct PeerState {
        request: (u64, sha256d::Hash),
@@ -180,7 +181,7 @@ pub fn scan_node(scan_time: Instant, node: SocketAddr) {
                } 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 != "" {
+                       if old_state != state_lock.fail_reason && state_lock.msg.0 != "" && state_lock.msg.1 {
                                printer.add_line(format!("Updating {} from {} to {}", node, old_state.to_str(), &state_lock.msg.0), state_lock.msg.1);
                        }
                }
@@ -263,7 +264,9 @@ fn make_trusted_conn(trusted_sockaddr: SocketAddr) {
                                                        = (headers.last().unwrap().bitcoin_hash(), top_height);
                                                printer.set_stat(printer::Stat::HeaderCount(top_height));
                                                if top_height >= starting_height as u64 {
-                                                       scan_net();
+                                                       if !SCANNING.swap(true, Ordering::SeqCst) {
+                                                               scan_net();
+                                                       }
                                                }
                                        } else {
                                                // Wat? Lets start again...