Changed how distributor notifies connection.

NathanMcMillan54 · Sep 25, 2024 · 98bd64e · 98bd64e
1 parent b34dda8
commit 98bd64e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/dl_instance/distributor/distributor/src/distributor/distributors/mod.rs b/dl_instance/distributor/distributor/src/distributor/distributors/mod.rs
@@ -18,6 +18,7 @@ impl DarkLightDistributor {
                 continue;
             }
 
+            println!("Connecting to {}...", self.info.config.tcp_connections[i].clone());
             let mut stream = test_stream.unwrap();
             stream.write(b"INIT-DIS-CONN");
             let mut tcp_distributor = TcpDistributor::new(stream, String::new());
@@ -27,10 +28,8 @@ impl DarkLightDistributor {
                 continue;
             }
 
-            sleep_condition!(1 == 1);
-            tcp_distributor.stream.write(b"INIT-DIS-VRFY");
+            println!("Verifying {}...", self.info.config.tcp_connections[i].clone());
             let verify_ret = tcp_distributor.verify_distributor();
-
             if verify_ret == false {
                 continue;
             } else {
@@ -46,18 +45,19 @@ impl DarkLightDistributor {
 
         loop {
             for i in 0..self.tcp_distributors.len() {
-                if self.tcp_distributors[i].msg == String::from("INIT-DIS-VRFY") {
-                    let conn_ret = self.tcp_distributors[i].attempt_connect();
-                    if conn_ret == false {
-                        self.tcp_distributors.remove(i);
-                        break;
-                    }
-                } else if self.tcp_distributors[i].msg == String::from("INIT-DIS-CONN") {
+                if self.tcp_distributors[i].msg == String::from("INIT-DIS-CONN") {
+                    println!("Verifying external distirbutor connection...");
                     let verify_ret = self.tcp_distributors[i].verify_distributor();
                     if verify_ret == false {
                         self.tcp_distributors.remove(i);
                         break;
                     }
+
+                    println!("Connecting to verified distirbutor...");
+                    let conn_ret = self.tcp_distributors[i].attempt_connect();
+                    if conn_ret == false {
+                        self.tcp_distributors.remove(i);
+                    }
                 }
             }
         }

diff --git a/dl_instance/distributor/distributor/src/distributor/distributors/tcp.rs b/dl_instance/distributor/distributor/src/distributor/distributors/tcp.rs
@@ -114,6 +114,7 @@ impl ExternalDistributorRW for TcpDistributor {
             }
         }
 
+        println!("done: {:?}", self.info);
         // check magic num
 
         true
-Original file line number
+Diff line change
@@ Expand Up / @@ -114,6 +114,7 @@ impl ExternalDistributorRW for TcpDistributor { @@
                 }
             }
+            println!("done: {:?}", self.info);
             // check magic num
             true
@@ Expand Down @@