From ca18c6912ec69cb599443a9be095b34c46408b66 Mon Sep 17 00:00:00 2001
From: fred <support@qo-op.com>
Date: Sun, 25 Feb 2024 14:34:06 +0100
Subject: [PATCH] clean > 3h UPlanetKeys - flashmem multi refresh -

---
 UPlanetKEYS_refresh.sh | 15 ++++++++++++---
 _12345.sh              |  5 +++--
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/UPlanetKEYS_refresh.sh b/UPlanetKEYS_refresh.sh
index 1571a19c..be39cebd 100755
--- a/UPlanetKEYS_refresh.sh
+++ b/UPlanetKEYS_refresh.sh
@@ -12,6 +12,7 @@ ME="${0##*/}"
 ## LOG into ~/.zen/tmp/_12345.log
 exec 2>&1 >> ~/.zen/tmp/_12345.log
 
+echo "=========================="
 echo "(◕‿◕ ) ${ME} (◕‿◕ ) "
 
 ## LOCAL
@@ -36,28 +37,36 @@ MErunning=$(ps axf --sort=+utime | grep -w ${ME} | grep -v -E 'color=auto|grep'
 
 echo "(◕‿◕ ) ${ME} starting UPlanet Terraformation _______________________________"
 
+## COMBINE & SHUFFLE KEYS
 combined=("${LWKEYS[@]}" "${LSKEYS[@]}" "${LRKEYS[@]}" "${WKEYS[@]}" "${SKEYS[@]}" "${RKEYS[@]}")
 UKEYS=($(echo "${combined[@]}" | tr ' ' '\n' | sort -u))
 echo ${#UKEYS[@]} "  JOBS..."
 
-## STORAGE FOR IPFS GET on UPLANET KEYS
+## STORAGE FOR IPFS GET UplanetKeyS
 mkdir -p ~/.zen/tmp/flashmem
 
+## Remove flashmem/UplanetKey older than 3 hours
+find ~/.zen/tmp/flashmem -mmin +180 -exec rm -r {} +
+
 floop=0
 medo=0
 
 for key in ${UKEYS[@]}; do
+
     [[ -d ~/.zen/tmp/flashmem/$key ]] \
         && echo "$key already copied" && medo=$((medo +1)) && continue
 
     mkdir -p ~/.zen/tmp/flashmem/$key
     echo "ipfs --timeout 180s get -o ~/.zen/tmp/flashmem/$key /ipns/$key"
     ipfs --timeout 180s get -o ~/.zen/tmp/flashmem/$key /ipns/$key
-    [[ $? == 0 ]] && medo=$((medo +1)) || rm -Rf ~/.zen/tmp/flashmem/$key
+    [[ $? == 0 ]] && medo=$((medo +1)) || rm -Rf ~/.zen/tmp/flashmem/$key # GOT IT or NOT ?
 
     floop=$((floop +1))
     [ $floop -gt 33 ] && break
-done
 
+done
+echo "=========================="
 echo "(◕‿◕ ) ${ME} :: $medo SUCCESS missing $floop KEYS from ${#UKEYS[@]} JOBS"
+echo "=========================="
+
 exit 0
diff --git a/_12345.sh b/_12345.sh
index 1ad19406..27350b9f 100755
--- a/_12345.sh
+++ b/_12345.sh
@@ -286,6 +286,7 @@ Content-Type: application/json; charset=UTF-8
 
     if [[ $T2WAIT == 0 || $T2WAIT != $(cat ~/.zen/tmp/random.sleep 2>/dev/null) ]]; then
         (
+            echo "# AUTO RELAUNCH IN $T2WAIT SECONDS"
             echo $T2WAIT > ~/.zen/tmp/random.sleep
             sleep $T2WAIT && rm ~/.zen/tmp/random.sleep
             curl -s "http://127.0.0.1:12345"
@@ -311,16 +312,16 @@ Content-Type: application/json; charset=UTF-8
     #####################################################################
     if [[ ${arr[0]} != "" ]]; then
 
-        ## CHECK URL CONSISTENCY ( G1PUB=IPNSPUB is right ? )
+        ## CHECK URL CONSISTENCY ( do we get G1PUB=IPNSPUB right ? )
         GPUB=${arr[0]}
         ASTROTOIPFS=$(${MY_PATH}/tools/g1_to_ipfs.py ${arr[0]} 2>/dev/null)
 
         if [[ "${ASTROTOIPFS}" == "${arr[1]}" && ${ASTROTOIPFS} != "" && ${arr[1]} != "" ]]; then
             ## WE SPEAK THE SAME PROTOCOL
-            echo "MAJOR TOM TO GROUD CONTROL"
             echo "WE HAVE A STATION ${GPUB} CONTACT"
             (
             mkdir -p ~/.zen/tmp/swarm/${ASTROTOIPFS}
+            echo "<<< MAJOR TOM TO GROUND CONTROL >>>"
             echo "UPSYNC TO  ~/.zen/tmp/swarm/${ASTROTOIPFS}"
             ipfs --timeout 180s get -o ~/.zen/tmp/swarm/${ASTROTOIPFS} /ipns/${ASTROTOIPFS}
             ) &