From 90fbb3e07cc214d03b0298233ec0c8dbfab5e378 Mon Sep 17 00:00:00 2001
From: ak <alok@harmony.one>
Date: Sat, 15 Jun 2019 11:53:05 -0700
Subject: [PATCH] monitor improvement

---
 scripts/monitor.sh | 39 ++++++++++++++++++++++++++-------------
 1 file changed, 26 insertions(+), 13 deletions(-)

diff --git a/scripts/monitor.sh b/scripts/monitor.sh
index 72dd353c3..a6ec7bbf3 100644
--- a/scripts/monitor.sh
+++ b/scripts/monitor.sh
@@ -13,20 +13,20 @@ Monitor Help:
 Actions:
     1. status        - Generates a status report of your node
 EOT
-	exit 0
+    exit 0
 }
 
 
 while getopts "h" opt; do
-	case $opt in
-		h) usage ;;
-		*) usage ;;
-	esac
+    case $opt in
+        h) usage ;;
+        *) usage ;;
+    esac
 done
 
-cd $HOME
+#cd $HOME
 #check if you're in snych
-heightStatus=$(grep otherHeight ./latest/validator-54.221.12.96-9000.log |  egrep  -o "myHeight(.*)([0-9]+)," | tail -n 1)
+heightStatus=$(grep otherHeight ./latest/validator*.log |  egrep  -o "myHeight(.*)([0-9]+)," | tail -n 1)
 
 # Which Shard
 my_shard=$(egrep -o "shard\/[0-9]+" ./latest/validator*.log | tail -n 1)
@@ -34,19 +34,32 @@ my_shard=$(egrep -o "shard\/[0-9]+" ./latest/validator*.log | tail -n 1)
 # Which IP
 ip=$(curl http://169.254.169.254/latest/meta-data/public-ipv4)
 
+bingos=$(grep -c "BINGO" ./latest/*log)
+
+# balances=$(./wallet.sh balances)
+
+status=$(tac ./latest/* | egrep -m1 'BINGO|HOORAY' | \
+    grep ViewID | \
+    python -c $'import datetime, sys, json;\nfor x in sys.stdin:\n y = json.loads(x); print "%10s %s %s" % (y.get("ViewID", "*" + str(y.get("myViewID", 0))), datetime.datetime.strftime(datetime.datetime.strptime(y["t"][:-4], "%Y-%m-%dT%H:%M:%S.%f") + datetime.timedelta(hours=-7), "%m/%d %H:%M:%S.%f"), y["ip"])')
+
+#sudo /sbin/ldconfig -v
+#nodeVersion=$(LD_LIBRARY_PATH=$(pwd) ./harmony -version)
+
 #check if you're in snych
 
 #Reward
-./wallet.sh balances
 
-echo "Your Sync Status: "$heightStatus
-echo "Your Shard: " $my_shard
-echo "Your IP: "$ip
-echo "You Reward: "
+#echo "Your Node Version : "
+LD_LIBRARY_PATH=$(pwd) ./harmony -version
+echo "Your System Status : "$status
+echo "Your Sync Status : "$heightStatus
+echo "Your Shard : " $my_shard
+echo "Your IP: " $ip
+echo "Blocks Received : " $bingos
+echo "Your Rewards: "
 ./wallet.sh balances
 
 
-
 # display the first block you started receiving
 
 # show the percentage of earned / recieved