From 6702aba80e1e662be5622fd56228a88c8267154e Mon Sep 17 00:00:00 2001 From: fred Date: Tue, 21 Sep 2021 01:38:38 +0200 Subject: [PATCH] killing old same script... for a while... process are stuck --- cron_MINUTE.sh | 13 +++++++++---- zen/new_file_in_astroport.sh | 12 +++++++----- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/cron_MINUTE.sh b/cron_MINUTE.sh index a8168da..5721baf 100755 --- a/cron_MINUTE.sh +++ b/cron_MINUTE.sh @@ -191,7 +191,10 @@ fi ################################################################## # TODO: IDEA make gchange/ipfs/ipns refresh speed depending on ipfs swarm size and DEFCON level ! ## SYNC GCHANGE EVERY 12 hours runtime -[[ $(($runtime % 725)) == 0 || "$runtime" == "5" ]] && $MY_PATH/zen/gchange_INIT.sh 2>&1 > /home/${YOU}/.zen/ipfs/.${IPFSNODEID}/.log.gchange_INIT.txt +if [[ $(($runtime % 725)) == 0 || "$runtime" == "5" ]]; then + kill -9 $(ps auxf --sort=+utime | grep -w gchange_INIT.sh | grep -v -E 'color=auto|grep' | tail -n 1 | awk '{print $2}') && echo "KILLING gchange_INIT.sh" + $MY_PATH/zen/gchange_INIT.sh 2>&1 > /home/${YOU}/.zen/ipfs/.${IPFSNODEID}/.log.gchange_INIT.txt +fi # If NEW ~/.ipfs/config.new => restarting IPFS daemon if [[ -f ~/.ipfs/config.new && $(diff ~/.ipfs/config.new ~/.ipfs/config) ]]; then cp ~/.ipfs/config.new ~/.ipfs/config @@ -200,11 +203,13 @@ if [[ -f ~/.ipfs/config.new && $(diff ~/.ipfs/config.new ~/.ipfs/config) ]]; the fi ## RESHAPE IPFS FRIENDS SWARM -[[ $(($runtime % 370)) == 0 || "$runtime" == "10" ]] && $MY_PATH/zen/gchange_IPFS_swarm.sh 2>&1 > /home/${YOU}/.zen/ipfs/.${IPFSNODEID}/.log.gchange_IPFS_swarm.txt - +if [[ $(($runtime % 370)) == 0 || "$runtime" == "10" ]]; then + kill -9 $(ps auxf --sort=+utime | grep -w gchange_IPFS_swarm.sh | grep -v -E 'color=auto|grep' | tail -n 1 | awk '{print $2}') && echo "KILLING gchange_IPFS_swarm.sh" + $MY_PATH/zen/gchange_IPFS_swarm.sh 2>&1 > /home/${YOU}/.zen/ipfs/.${IPFSNODEID}/.log.gchange_IPFS_swarm.txt +fi # SYNC IPFS FRIENDS SWARM if [[ $(($runtime % 25)) == 0 ]]; then - kill -9 $(ps auxf --sort=+utime | grep -w p4n.swarmscraper.sh | grep -v -E 'color=auto|grep' | tail -n 1 | awk '{print $2}') + kill -9 $(ps auxf --sort=+utime | grep -w p4n.swarmscraper.sh | grep -v -E 'color=auto|grep' | tail -n 1 | awk '{print $2}') && echo "KILLING p4n.swarmscraper.sh" killall chromium $MY_PATH/zen/ipfs_SWARM_refresh.sh 2>&1 > /home/${YOU}/.zen/ipfs/.${IPFSNODEID}/.log.ipfs_SWARM_refresh.txt fi diff --git a/zen/new_file_in_astroport.sh b/zen/new_file_in_astroport.sh index ffeaf15..e1eb67f 100755 --- a/zen/new_file_in_astroport.sh +++ b/zen/new_file_in_astroport.sh @@ -337,14 +337,16 @@ IPNSLINK=$(ipfs key list -l | grep ${MEDIAKEY} | cut -d ' ' -f 1) ######################################################################## ## PUBLISH new IPNS ######################################################################## -NEWIPFS=$(ipfs add -rHq ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/ | tail -n 1 ) -## ADD CHAIN BLOCK ZERO -echo $NEWIPFS > ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/.chain echo "$(date -u +%s%N | cut -b1-13)" > ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/.timestamp + NEWIPFS=$(ipfs add -rHq ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/ | tail -n 1 ) -[ ! $? -eq 0 ] && echo "~~~ FAILURE ~~~ ipfs add -rHq ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/ | tail -n 1" && exit 1 +[[ "$NEWIPFS" == "" ]] && echo "~~~ FAILURE ~~~ ipfs add -rHq ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/ | tail -n 1" && exit 1 + +## ADD CHAIN BLOCK ZERO (will be updated by ipns_TAG_refresh.sh) +echo $NEWIPFS > ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/.chain + IPNS=$(ipfs name publish --quieter --key="${MEDIAKEY}" $NEWIPFS) -[ ! $? -eq 0 ] && echo "~~~ FAILURE ~~~ ipfs name publish --quieter --key=${MEDIAKEY} $NEWIPFS" && exit 1 +[[ "$IPNS" == "" ]] && echo "~~~ PROBLEM ~~~ ipfs name publish --quieter --key=${MEDIAKEY} $NEWIPFS" ######################################################################## ########################################################################