From 1bfa361f6548ded654fb06ed3f85965d7b3590cb Mon Sep 17 00:00:00 2001 From: rootzoll Date: Fri, 2 Jul 2021 14:47:50 +0200 Subject: [PATCH] remove double scan info --- home.admin/00infoLCD.sh | 4 +- home.admin/setup.scripts/controlScanInfo.sh | 250 ------------------ .../setup.scripts/eventBlockchainSync.sh | 3 +- 3 files changed, 4 insertions(+), 253 deletions(-) delete mode 100755 home.admin/setup.scripts/controlScanInfo.sh diff --git a/home.admin/00infoLCD.sh b/home.admin/00infoLCD.sh index 7452aae0d..fbe70e5d9 100755 --- a/home.admin/00infoLCD.sh +++ b/home.admin/00infoLCD.sh @@ -100,8 +100,8 @@ while : # if LND is syncing or scanning lndSynced=$(sudo -u bitcoin /usr/local/bin/lncli --chain=${network} --network=${chain}net getinfo 2>/dev/null | jq -r '.synced_to_chain' | grep -c true) if [ ${lndSynced} -eq 0 ]; then - /home/admin/setup.scripts/controlScanInfo.sh - sleep 20 + /home/admin/setup.scripts/eventBlockchainSync.sh lcd + sleep 10 continue fi diff --git a/home.admin/setup.scripts/controlScanInfo.sh b/home.admin/setup.scripts/controlScanInfo.sh deleted file mode 100755 index 38a8065c9..000000000 --- a/home.admin/setup.scripts/controlScanInfo.sh +++ /dev/null @@ -1,250 +0,0 @@ -#!/bin/bash - -source /home/admin/_version.info -source /home/admin/raspiblitz.info -source /mnt/hdd/raspiblitz.conf - -# all system/service info gets detected by blitz.statusscan.sh -source <(sudo /home/admin/config.scripts/blitz.statusscan.sh) -source <(sudo /home/admin/config.scripts/internet.sh status) - -# when admin and no other error found run LND setup check -if [ "$USER" == "admin" ] && [ ${#lndErrorFull} -eq 0 ]; then - lndErrorFull=$(sudo /home/admin/config.scripts/lnd.check.sh basic-setup | grep "err=" | tail -1) -fi - -# set follow up info different for LCD and ADMIN -adminStr="ssh admin@${localip} ->Password A" -if [ "$USER" == "admin" ]; then - adminStr="Use CTRL+c to EXIT to Terminal" -fi - -# bitcoin errors always first -if [ ${bitcoinActive} -eq 0 ] || [ ${#bitcoinErrorFull} -gt 0 ] || [ "${1}" == "blockchain-error" ]; then - - #################### - # On Bitcoin Error - #################### - - height=6 - width=43 - title="Blockchain Info" - - if [ ${#bitcoinErrorShort} -eq 0 ]; then - bitcoinErrorShort="Initial Startup - Please Wait" - fi - - if [ "$USER" != "admin" ]; then - - if [ ${uptime} -gt 600 ]; then - if [ ${uptime} -gt 1000 ] || [ ${#bitcoinErrorFull} -gt 0 ] || [ "${1}" == "blockchain-error" ]; then - infoStr=" The ${network}d service is NOT RUNNING!\n ${bitcoinErrorShort}\n Login for more details & options:" - else - infoStr=" The ${network}d service is running:\n ${bitcoinErrorShort}\n Login with SSH for more details:" - fi - else - infoStr=" The ${network}d service is starting:\n ${bitcoinErrorShort}\n Login with SSH for more details:" - fi - - else - - # output when user login in as admin and bitcoind is not running - if [ ${uptime} -lt 600 ]; then - infoStr=" The ${network}d service is starting:\n ${bitcoinErrorShort}\n Please wait at least 10min ..." - elif [[ "${bitcoinErrorFull}" == *"error code: -28"* ]]; then - infoStr=" The ${network}d service is warming up:\n ${bitcoinErrorShort}\n Please wait ..." - elif [ ${#bitcoinErrorFull} -gt 0 ] || [ "${bitcoinErrorShort}" == "Error found in Logs" ] || [ "${1}" == "blockchain-error" ]; then - clear - echo "" - echo "*****************************************" - echo "* The ${network}d service is not running." - echo "*****************************************" - echo "If you just started some config/setup, this might be OK." - echo - if [ ${startcountBlockchain} -gt 1 ]; then - echo "${startcountBlockchain} RESTARTS DETECTED - ${network}d might be in a error loop" - cat /home/admin/systemd.blockchain.log | grep "ERROR" | tail -n -1 - echo - fi - if [ ${#bitcoinErrorFull} -gt 0 ]; then - echo "More Error Detail:" - echo ${bitcoinErrorFull} - echo - fi - - echo "POSSIBLE OPTIONS:" - source <(/home/admin/config.scripts/network.txindex.sh status) - if [ "${txindex}" == "1" ]; then - echo "-> Use command 'repair' and then choose 'DELETE-INDEX' to try rebuilding transaction index." - fi - echo "-> Use command 'repair' and then choose 'RESET-CHAIN' to try downloading new blockchain." - echo "-> Use command 'debug' for more log output you can use for getting support." - echo "-> Use command 'menu' to open main menu." - echo "-> Have you tried to turn it off and on again? Use command 'restart'" - echo "" - exit 1 - fi - - fi - -# LND errors second -elif [ ${lndActive} -eq 0 ] || [ ${#lndErrorFull} -gt 0 ] || [ "${1}" == "lightning-error" ]; then - - #################### - # On LND Error - #################### - - height=6 - width=43 - title="Lightning Info" - if [ ${uptime} -gt 600 ] || [ "${1}" == "lightning-error" ]; then - if [ ${#lndErrorShort} -gt 0 ]; then - height=6 - lndErrorShort=" ${lndErrorShort}\n" - fi - if [ ${lndActive} -eq 0 ]; then - infoStr=" The LND service is not running.\n${lndErrorShort} Login for more details:" - else - infoStr=" The LND service is running with error.\n${lndErrorShort} Login for more details:" - fi - if [ "$USER" == "admin" ]; then - clear - echo "" - echo "****************************************" - if [ ${lndActive} -eq 0 ]; then - echo "* The LND service is not running." - else - echo "* The LND service is running with error." - fi - echo "****************************************" - echo "If you just started some config/setup, this might be OK." - echo - if [ ${startcountLightning} -gt 1 ]; then - echo "${startcountLightning} RESTARTS DETECTED - LND might be in a error loop" - cat /home/admin/systemd.lightning.log | grep "ERROR" | tail -n -1 - fi - sudo journalctl -u lnd -b --no-pager -n14 | grep "lnd\[" - sudo /home/admin/config.scripts/lnd.check.sh basic-setup | grep "err=" - if [ ${#lndErrorFull} -gt 0 ]; then - echo "More Error Detail:" - echo ${lndErrorFull} - fi - echo - echo "-> Use command 'repair' and then choose 'BACKUP-LND' to make a just in case backup." - echo "-> Use command 'debug' for more log output you can use for getting support." - echo "-> Use command 'menu' to open main menu." - echo "-> Have you tried to turn it off and on again? Use command 'restart'" - echo "" - exit 1 - else - source <(sudo /home/admin/config.scripts/lnd.check.sh basic-setup) - if [ ${wallet} -eq 0 ] || [ ${macaroon} -eq 0 ] || [ ${config} -eq 0 ] || [ ${tls} -eq 0 ]; then - infoStr=" The LND service needs RE-SETUP.\n Login with SSH to continue:" - fi - fi - else - infoStr=" The LND service is starting.\n Login for more details:" - if [ "$USER" == "admin" ]; then - infoStr=" The LND service is starting.\n Please wait up to 5min ..." - fi - fi - -# if LND wallet is locked -elif [ ${walletLocked} -gt 0 ]; then - - height=5 - width=43 - - if [ "${autoUnlock}" = "on" ]; then - title="Auto Unlock" - infoStr=" Waiting for Wallet Auto-Unlock.\n Please wait up to 5min ..." - else - - if [ "$USER" == "admin" ]; then - /home/admin/config.scripts/lnd.unlock.sh - else - title="Action Required" - infoStr=" LND WALLET IS LOCKED !!!\n" - if [ "${rtlWebinterface}" = "on" ]; then - height=6 - infoStr="${infoStr} Browser: http://${localip}:3000\n PasswordB=login / PasswordC=unlock" - else - infoStr="${infoStr} Please use SSH to unlock:" - fi - if [ ${startcountLightning} -gt 1 ]; then - width=45 - height=$((height+3)) - infoStr=" LIGHTNING RESTARTED - login for details\n${infoStr}" - adminStr="${adminStr}\n or choose 'INFO' in main menu\n or type 'raspiblitz' on terminal" - fi - fi - - fi - -else - - #################### - # Sync Progress - #################### - - # check number of peers - source <(sudo -u admin /home/admin/config.scripts/network.monitor.sh peer-status) - - # basic dialog info - height=6 - width=45 - title="Node is Syncing" - actionString="Please wait - this can take some time" - - # formatting BLOCKCHAIN SYNC PROGRESS - if [ ${#syncProgress} -eq 0 ]; then - if [ ${startcountBlockchain} -lt 2 ]; then - syncProgress="waiting" - else - syncProgress="${startcountBlockchain} restarts" - actionString="Login with SSH for more details:" - fi - elif [ ${#syncProgress} -lt 6 ]; then - syncProgress=" ${syncProgress} % ${peers} peers" - else - syncProgress="${syncProgress} % ${peers} peers" - fi - - # formatting LIGHTNING SCAN PROGRESS - if [ ${#scanProgress} -eq 0 ]; then - - # in case of LND RPC is not ready yet - if [ ${scanTimestamp} -eq -2 ]; then - - scanProgress="prepare sync" - - # in case LND restarting >2 - elif [ ${startcountLightning} -gt 2 ]; then - - scanProgress="${startcountLightning} restarts" - actionString="Login with SSH for more details:" - - # check if a specific error can be identified for restarts - lndSetupErrorCount=$(sudo /home/admin/config.scripts/lnd.check.sh basic-setup | grep -c "err=") - if [ ${lndSetupErrorCount} -gt 0 ]; then - scanProgress="possible error" - fi - - # unkown cases - else - scanProgress="waiting" - fi - - elif [ ${#scanProgress} -lt 6 ]; then - scanProgress=" ${scanProgress} % ${lndPeers} peers" - else - scanProgress="${scanProgress} % ${lndPeers} peers" - fi - - # setting info string - infoStr=" Blockchain Progress : ${syncProgress}\n Lightning Progress : ${scanProgress}\n ${actionString}" - -fi - -# display info to user -dialog --title " ${title} " --backtitle "RaspiBlitz ${codeVersion} ${hostname} / ${network} / ${chain} / ${tempCelsius}°C" --infobox "${infoStr}\n ${adminStr}" ${height} ${width} diff --git a/home.admin/setup.scripts/eventBlockchainSync.sh b/home.admin/setup.scripts/eventBlockchainSync.sh index 125026cc7..5d4b1259a 100644 --- a/home.admin/setup.scripts/eventBlockchainSync.sh +++ b/home.admin/setup.scripts/eventBlockchainSync.sh @@ -72,7 +72,8 @@ do fi # display info to user - dialog --title " Node is Syncing " --backtitle "RaspiBlitz ${codeVersion} ${hostname} / ${network} / ${chain} / ${tempCelsius}°C" --infobox "${infoStr}\n ${adminStr}" ${height} ${width} + time=$(date '+%H:%M:%S') + dialog --title " Node is Syncing (${time})" --backtitle "RaspiBlitz ${codeVersion} ${hostname} / ${network} / ${chain} / ${tempCelsius}°C" --infobox "${infoStr}\n ${adminStr}" ${height} ${width} # determine to loop or not loop=0