Improvements to monitor.sh and cron.sh

bin/cron.sh

@@ -6,8 +6,8 @@ source ./env
 exec < /dev/null > /dev/null 2> /dev/null
 (
     ./start.sh &
-    while ./monitor.sh
+    while ./monitor.sh || true
     do
-	sleep 60
+        sleep 60
     done &
 )

bin/monitor.sh

@@ -34,7 +34,8 @@ function json_result
 bfaconfig node
 json_query admin_peers
 numpeers=$( json_result | json_arraylength )
-statusfile=$( bfamktemp )
+statusfile=$( mktemp )
+cleanup "$statusfile"
 (
   echo -n "time: "
   date
@@ -53,13 +54,31 @@ do
 	echo "$json" |
 	jq -r .result[$idx].id
   )
-  remoteip=$(
+  remoteaddress=$(
 	echo "$json" |
-	jq -r .result[$idx].network.remoteAddress |
-	sed 's/:[0-9][0-9]*$//'i
+	jq -r .result[$idx].network.remoteAddress
+  )
+  remoteip=$(
+	echo "$remoteaddress" |
+	sed 's/:[0-9][0-9]*$//'
+  )
+  remoteport=$(
+	echo "$remoteaddress" |
+	sed 's/^.*://'
   )
   mkdir -p "${BFANETWORKDIR}/lastseen/${remoteid}"
-  touch    "${BFANETWORKDIR}/lastseen/${remoteid}/${remoteip}"
+  if [ -r "${BFANETWORKDIR}/lastseen/${remoteid}/${remoteip}" ]
+  then
+  	storedport=$( cat "${BFANETWORKDIR}/lastseen/${remoteid}/${remoteip}" )
+  	test "${remoteport}" = "${storedport}" &&
+		unset remoteport
+  fi
+  if [ -n "${remoteport}" ]
+  then
+  	echo "${remoteport}" > "${BFANETWORKDIR}/lastseen/${remoteid}/${remoteip}"
+  else
+  	touch    "${BFANETWORKDIR}/lastseen/${remoteid}/${remoteip}"
+  fi
   echo "peer: ${remoteid}" >> $statusfile
   peercount=$(( $peercount + 1 ))
 done