From 810e247a0f42ab45f9819c5e016c21874d3f7b52 Mon Sep 17 00:00:00 2001
From: Joseph Henry <joseph.henry@zerotier.com>
Date: Mon, 1 May 2023 15:16:28 -0700
Subject: [PATCH] Add more debug output

---
 .github/workflows/validate-1m-linux.sh | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/validate-1m-linux.sh b/.github/workflows/validate-1m-linux.sh
index 8ba500d93..ec923a5fe 100755
--- a/.github/workflows/validate-1m-linux.sh
+++ b/.github/workflows/validate-1m-linux.sh
@@ -119,9 +119,9 @@ time_zt_node2_start=`date +%s`
 
 for ((s=0; s<=MAX_WAIT_SECS; s++))
 do
-    echo "Checking for online status: $s"
     node1_online="$($ZT1 -j info | jq '.online' 2>/dev/null)"
     node2_online="$($ZT2 -j info | jq '.online' 2>/dev/null)"
+    echo "Checking for online status: try #$s, node1:$node1_online, node2:$node2_online"
     if [[ "$node1_online" == "true" ]]
     then
         time_zt_node1_online=`date +%s`
@@ -138,19 +138,26 @@ do
     sleep 1
 done
 
+echo -e "\nStatus of each instance:"
+
+echo -e "\n\nNode 1:"
+$ZT1 status
+echo -e "\n\nNode 2:"
+$ZT2 status
+
+echo -e "\nps:"
+
+echo -e "\n\nNode 1:"
+$NS1 ps aux | grep zerotier-one
+echo -e "\n\nNode 2:"
+$NS2 ps aux | grep zerotier-one
+
 if [[ "$both_instances_online" != "true" ]]
 then
-    echo "One or more instances of ZeroTier failed to come online. Aborting test." >&2
-    $ZT1 -j info
-    $ZT2 -j info
+    echo "One or more instances of ZeroTier failed to come online. Aborting test."
     exit 1
 fi
 
-echo -e "\nChecking status of each instance:"
-
-$ZT1 status
-$ZT2 status
-
 echo -e "\nJoining networks"
 
 $ZT1 join $TEST_NETWORK