From 237e71543976bb85b4b78b71eeaa4716027de2da Mon Sep 17 00:00:00 2001 From: Dockyr <32191714+rykcod@users.noreply.github.com> Date: Fri, 5 Aug 2022 12:29:14 +0200 Subject: [PATCH] 13.0.2 Purge useless packages with binaries and add logs to logs container --- .github/workflows/docker-image.yml | 2 +- Dockerfile | 11 ++--- README.md | 1 + massa-guard.sh | 2 +- sources/init_copy_host_files.sh | 20 ++++----- sources/lib.sh | 66 ++++++++++++++++-------------- 6 files changed, 54 insertions(+), 48 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 396ba4c..8d3f8bc 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -32,4 +32,4 @@ jobs: uses: docker/build-push-action@v2 with: push: true - tags: rykcod/massa:episode13.0.1,rykcod/massa:latest + tags: rykcod/massa:episode13.0.2,rykcod/massa:latest diff --git a/Dockerfile b/Dockerfile index 06d331d..154d9fd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,17 +3,17 @@ FROM ubuntu:20.04 # LABEL about the custom image LABEL maintainer="benoit@alphatux.fr" -LABEL version="0.13.0.1" +LABEL version="0.13.0.2" LABEL description="Node Massa" -# Defini le timezone du container +# Set timezone and default cli SHELL ["/bin/bash", "-c"] ENV DEBIAN_FRONTEND="noninteractive" TZ="Europe/Paris" -# Met a jour la liste des paquets +# Update and install packages RUN apt-get update \ && apt-get upgrade -y \ -&& apt install -y pkg-config curl wget libclang-dev build-essential libssl-dev screen procps python3-pip netcat \ +&& apt install -y curl wget screen procps python3-pip netcat \ && apt autoclean -y \ && python3 -m pip install -U discord.py @@ -22,6 +22,7 @@ RUN wget https://github.com/massalabs/massa/releases/download/TEST.13.0/massa_TE && tar -zxpf massa_TEST.13.0_release_linux.tar.gz \ && rm -f massa_TEST.13.0_release_linux.tar.gz +# Create massa-guard tree RUN mkdir /massa-guard \ && mkdir /massa-guard/sources \ && mkdir /massa-guard/config @@ -41,7 +42,7 @@ EXPOSE 31244 EXPOSE 31245 EXPOSE 33035 -# Lancement du node +# Node run then massa-guard CMD /massa-guard/sources/init_copy_host_files.sh \ && bash /massa-guard/sources/run.sh \ && bash /massa-guard/massa-guard.sh diff --git a/README.md b/README.md index 337a467..d23975a 100644 --- a/README.md +++ b/README.md @@ -28,6 +28,7 @@ This image include a script named "**/massa-guard/massa-guard.sh**" to: - Massa-guard auto get faucet to buy your first roll. ### [RELEASE NOTES] ### +- 20220805 - Testnet 13 - v13.0.2 - Purge useless packages with binaries and add logs to logs container - 20220805 - Testnet 13 - v13.0.1 - Create from Massa binaries - 20220722 - Testnet 13 - v13.0.0 - v13.0 Ready! - 20220722 - Testnet 12 - v12.2.0 - v12.2 Ready! diff --git a/massa-guard.sh b/massa-guard.sh index 99956b0..acc9234 100644 --- a/massa-guard.sh +++ b/massa-guard.sh @@ -12,7 +12,7 @@ WaitBootstrap #====================== Check and load ==========================# # Log MASSA-GUARD Start -echo "[$(date +%Y%m%d-%HH%M)][INFO][START]MASSA-GUARD is starting" >> $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt +echo "[$(date +%Y%m%d-%HH%M)][INFO][START]MASSA-GUARD is starting" |& tee -a $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt # Load Wallet and Node key or create it and stake wallet CheckOrCreateWalletAndNodeKey # Get stacking address diff --git a/sources/init_copy_host_files.sh b/sources/init_copy_host_files.sh index cca930c..6b7efb4 100644 --- a/sources/init_copy_host_files.sh +++ b/sources/init_copy_host_files.sh @@ -11,17 +11,17 @@ if [ ! -e $PATH_CONF_MASSAGUARD/config.ini ] then mkdir -p $PATH_LOGS_MASSAGUARD - echo "[$(date +%Y%m%d-%HH%M)][INFO][INIT]CREATE $PATH_LOGS_MASSAGUARD folder" >> $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt + echo "[$(date +%Y%m%d-%HH%M)][INFO][INIT]CREATE $PATH_LOGS_MASSAGUARD folder" |& tee -a $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt mkdir -p $PATH_LOGS_MASSANODE - echo "[$(date +%Y%m%d-%HH%M)][INFO][INIT]CREATE $PATH_LOGS_MASSANODE folder" >> $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt + echo "[$(date +%Y%m%d-%HH%M)][INFO][INIT]CREATE $PATH_LOGS_MASSANODE folder" |& tee -a $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt mkdir -p /massa_mount/config - echo "[$(date +%Y%m%d-%HH%M)][INFO][INIT]CREATE /massa_mount/config folder" >> $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt + echo "[$(date +%Y%m%d-%HH%M)][INFO][INIT]CREATE /massa_mount/config folder" |& tee -a $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt cp /massa-guard/config/default_config_template.ini $PATH_CONF_MASSAGUARD/config.ini if [ $DISCORD ]; then python3 $PATH_SOURCES/set_config.py "DISCORD_TOKEN" \"$DISCORD\" $PATH_CONF_MASSAGUARD/config.ini ; fi if [ $DYNIP ]; then python3 $PATH_SOURCES/set_config.py "DYN_PUB_IP" "$DYNIP" $PATH_CONF_MASSAGUARD/config.ini ; fi if [ $NODEPWD ]; then python3 $PATH_SOURCES/set_config.py "NODE_PWD" \"$NODEPWD\" $PATH_CONF_MASSAGUARD/config.ini ; fi if [ $WALLETPWD ]; then python3 $PATH_SOURCES/set_config.py "WALLET_PWD" \"$WALLETPWD\" $PATH_CONF_MASSAGUARD/config.ini ; fi - echo "[$(date +%Y%m%d-%HH%M)][INFO][INIT]COPY default config.ini" >> $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt + echo "[$(date +%Y%m%d-%HH%M)][INFO][INIT]COPY default config.ini" |& tee -a $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt fi # Load config.ini source <(grep = $PATH_CONF_MASSAGUARD/config.ini) @@ -34,7 +34,7 @@ BackupLogsNode if [ -e $PATH_MOUNT/config.toml ] then cp $PATH_MOUNT/config.toml $PATH_NODE_CONF/config.toml - echo "[$(date +%Y%m%d-%HH%M)][INFO][LOAD]LOAD $PATH_MOUNT/config.toml as ref" >> $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt + echo "[$(date +%Y%m%d-%HH%M)][INFO][LOAD]LOAD $PATH_MOUNT/config.toml as ref" |& tee -a $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt # If ref config.toml dont exist in massa_mount else if [ $IP ] @@ -53,27 +53,27 @@ else timeout 2 python3 $PATH_SOURCES/push_command_to_discord.py $DISCORD_TOKEN $myIP > $PATH_MASSABOT_REPLY fi - echo "[$(date +%Y%m%d-%HH%M)][INFO][INIT]Create your default config.toml with $myIP as routable IP" >> $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt + echo "[$(date +%Y%m%d-%HH%M)][INFO][INIT]Create your default config.toml with $myIP as routable IP" |& tee -a $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt fi # Wallet to use if [ -e $PATH_MOUNT/wallet.dat ] then cp $PATH_MOUNT/wallet.dat $PATH_CLIENT/wallet.dat - echo "[$(date +%Y%m%d-%HH%M)][INFO][LOAD]LOAD $PATH_MOUNT/wallet.dat as ref" >> $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt + echo "[$(date +%Y%m%d-%HH%M)][INFO][LOAD]LOAD $PATH_MOUNT/wallet.dat as ref" |& tee -a $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt fi # Node private key to use if [ -e $PATH_MOUNT/node_privkey.key ] then # Delete default node_privkey and load ref node_privkey - rm $PATH_NODE_CONF/node_privkey.key + if [ -e $PATH_NODE_CONF/node_privkey.key ]; then rm $PATH_NODE_CONF/node_privkey.key; fi cp $PATH_MOUNT/node_privkey.key $PATH_NODE_CONF/node_privkey.key - echo "[$(date +%Y%m%d-%HH%M)][INFO][LOAD]LOAD $PATH_MOUNT/node_privkey.key as ref" >> $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt + echo "[$(date +%Y%m%d-%HH%M)][INFO][LOAD]LOAD $PATH_MOUNT/node_privkey.key as ref" |& tee -a $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt fi # Wallet to use to stacke if [ -e $PATH_MOUNT/staking_keys.json ] then cp $PATH_MOUNT/staking_keys.json $PATH_NODE_CONF/staking_keys.json - echo "[$(date +%Y%m%d-%HH%M)][INFO][LOAD]LOAD $PATH_MOUNT/staking_keys.json as ref" >> $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt + echo "[$(date +%Y%m%d-%HH%M)][INFO][LOAD]LOAD $PATH_MOUNT/staking_keys.json as ref" |& tee -a $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt fi # If unreachable node file dont exist if [ ! -e $PATH_CONF_MASSAGUARD/bootstrappers_unreachable.txt ] diff --git a/sources/lib.sh b/sources/lib.sh index 8698a21..3e100cf 100644 --- a/sources/lib.sh +++ b/sources/lib.sh @@ -4,7 +4,7 @@ ############################################################# WaitBootstrap() { # Wait node booststrap - tail -n +1 -f $PATH_NODE/logs.txt | grep -m 1 "Successful bootstrap" + tail -n +1 -f $PATH_NODE/logs.txt | grep -m 1 "Successful bootstrap" > /dev/null sleep 10s return 0 } @@ -34,8 +34,8 @@ CheckOrCreateWalletAndNodeKey() { then # Generate wallet cd $PATH_CLIENT - $PATH_TARGET/massa-client -p $WALLET_PWD wallet_generate_secret_key - echo "[$(date +%Y%m%d-%HH%M)][INFO][INIT]Generate wallet.dat" >> $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt + $PATH_TARGET/massa-client -p $WALLET_PWD wallet_generate_secret_key > /dev/null + echo "[$(date +%Y%m%d-%HH%M)][INFO][INIT]Generate wallet.dat" |& tee -a $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt # Backup wallet to the mount point as ref cp $PATH_CLIENT/wallet.dat $PATH_MOUNT/wallet.dat @@ -44,9 +44,9 @@ CheckOrCreateWalletAndNodeKey() { kill $clientPID # Re-Launch client cd $PATH_CLIENT - screen -dmS massa-client bash -c 'cargo run --release -- -p '$WALLET_PWD'' + screen -dmS massa-client bash -c './massa-client -p '$WALLET_PWD'' - echo "[$(date +%Y%m%d-%HH%M)][INFO][INIT]Backup wallet.dat" >> $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt + echo "[$(date +%Y%m%d-%HH%M)][INFO][INIT]Backup wallet.dat" |& tee -a $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt fi ## Stacke if wallet not stacke @@ -58,11 +58,11 @@ CheckOrCreateWalletAndNodeKey() { cd $PATH_CLIENT privKey=$($PATH_TARGET/massa-client -p $WALLET_PWD wallet_info | grep "Secret key" | cut -d " " -f 3) # Stacke wallet - $PATH_TARGET/massa-client -p $WALLET_PWD node_add_staking_secret_keys $privKey - echo "[$(date +%Y%m%d-%HH%M)][INFO][INIT]Stake privKey" >> $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt + $PATH_TARGET/massa-client -p $WALLET_PWD node_add_staking_secret_keys $privKey > /dev/null + echo "[$(date +%Y%m%d-%HH%M)][INFO][INIT]Stake privKey" |& tee -a $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt # Backup staking_keys.json to mount point as ref cp $PATH_NODE_CONF/staking_keys.json $PATH_MOUNT/staking_keys.json - echo "[$(date +%Y%m%d-%HH%M)][INFO][INIT]Backup staking_keys.json" >> $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt + echo "[$(date +%Y%m%d-%HH%M)][INFO][INIT]Backup staking_keys.json" |& tee -a $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt fi ## Backup node_privkey if no ref in mount point @@ -71,7 +71,7 @@ CheckOrCreateWalletAndNodeKey() { then # Copy node_privkey.key to mount point as ref cp $PATH_NODE_CONF/node_privkey.key $PATH_MOUNT/node_privkey.key - echo "[$(date +%Y%m%d-%HH%M)][INFO][BACKUP]Backup $PATH_NODE_CONF/node_privkey.key to $PATH_MOUNT" >> $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt + echo "[$(date +%Y%m%d-%HH%M)][INFO][BACKUP]Backup $PATH_NODE_CONF/node_privkey.key to $PATH_MOUNT" |& tee -a $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt fi return 0 } @@ -117,7 +117,7 @@ BuyOrSellRoll() { # Check candidate roll > 0 and Mas amount >= 100 to buy first roll if ([ $1 -eq 0 ] && [ $2 -ge 100 ]) then - echo "[$(date +%Y%m%d-%HH%M)][KO][ROLL]BUY 1 ROLL" >> $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt + echo "[$(date +%Y%m%d-%HH%M)][KO][ROLL]BUY 1 ROLL" |& tee -a $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt # Buy roll amount cd $PATH_CLIENT @@ -126,13 +126,13 @@ BuyOrSellRoll() { # If MAS amount < 100 MAS and Candidate roll = 0 elif ([ $1 -eq 0 ] && [ $2 -lt 100 ]) then - echo "[$(date +%Y%m%d-%HH%M)][KO][ROLL]Cannot buy first ROLL because MAS Amount less than 100. Please get 100 MAS on Discord or set your DISCORD_ID on /massa_mount/config/config.ini" >> $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt + echo "[$(date +%Y%m%d-%HH%M)][KO][ROLL]Cannot buy first ROLL because MAS Amount less than 100. Please get 100 MAS on Discord or set your DISCORD_ID on /massa_mount/config/config.ini" |& tee -a $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt # If MAS amount > 200 MAS and no rolls limitation, buy ROLLs elif ([ $2 -gt 200 ] && [ $TARGET_ROLL_AMOUNT == "NULL" ]) then NbRollsToBuy=$((($2-100)/100)) - echo "[$(date +%Y%m%d-%HH%M)][INFO][ROLL]AUTOBUY $NbRollsToBuy ROLL because MAS amount equal to $2" >> $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt + echo "[$(date +%Y%m%d-%HH%M)][INFO][ROLL]AUTOBUY $NbRollsToBuy ROLL because MAS amount equal to $2" |& tee -a $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt # Buy roll amount cd $PATH_CLIENT $PATH_TARGET/massa-client -p $WALLET_PWD buy_rolls $3 $NbRollsToBuy 0 @@ -151,11 +151,11 @@ BuyOrSellRoll() { if [ $NbRollsCanBuyWithMAS -le $NbRollsNeedToBuy ] then NbRollsToBuy=$NbRollsCanBuyWithMAS - echo "[$(date +%Y%m%d-%HH%M)][INFO][ROLL]AUTOBUY $NbRollsToBuy ROLL because MAS amount equal to $2 and ROLL amount of $1 less than target amount of $TARGET_ROLL_AMOUNT" >> $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt + echo "[$(date +%Y%m%d-%HH%M)][INFO][ROLL]AUTOBUY $NbRollsToBuy ROLL because MAS amount equal to $2 and ROLL amount of $1 less than target amount of $TARGET_ROLL_AMOUNT" |& tee -a $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt # Else buy max amount you can buy else NbRollsToBuy=$NbRollsNeedToBuy - echo "[$(date +%Y%m%d-%HH%M)][INFO][ROLL]AUTOBUY $NbRollsToBuy ROLL because MAS amount equal to $2 and ROLL amount of $1 less than target amount of $TARGET_ROLL_AMOUNT" >> $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt + echo "[$(date +%Y%m%d-%HH%M)][INFO][ROLL]AUTOBUY $NbRollsToBuy ROLL because MAS amount equal to $2 and ROLL amount of $1 less than target amount of $TARGET_ROLL_AMOUNT" |& tee -a $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt fi # Buy roll amount cd $PATH_CLIENT @@ -164,7 +164,7 @@ BuyOrSellRoll() { elif [ $TARGET_ROLL_AMOUNT -lt $1 ] then NbRollsToSell=$(($1-$TARGET_ROLL_AMOUNT)) - echo "[$(date +%Y%m%d-%HH%M)][INFO][ROLL]AUTOSELL $NbRollsToSell ROLL because ROLL amount of $1 greater than target amount of $TARGET_ROLL_AMOUNT" >> $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt + echo "[$(date +%Y%m%d-%HH%M)][INFO][ROLL]AUTOSELL $NbRollsToSell ROLL because ROLL amount of $1 greater than target amount of $TARGET_ROLL_AMOUNT" |& tee -a $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt # Sell roll amount cd $PATH_CLIENT $PATH_TARGET/massa-client -p $WALLET_PWD sell_rolls $3 $NbRollsToSell 0 @@ -176,7 +176,7 @@ BuyOrSellRoll() { if [ $TARGET_ROLL_AMOUNT -lt $1 ] then NbRollsToSell=$(($1-$TARGET_ROLL_AMOUNT)) - echo "[$(date +%Y%m%d-%HH%M)][INFO][ROLL]AUTOSELL $NbRollsToSell ROLL because ROLL amount of $1 greater than target amount of $TARGET_ROLL_AMOUNT" >> $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt + echo "[$(date +%Y%m%d-%HH%M)][INFO][ROLL]AUTOSELL $NbRollsToSell ROLL because ROLL amount of $1 greater than target amount of $TARGET_ROLL_AMOUNT" |& tee -a $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt # Sell roll amount cd $PATH_CLIENT $PATH_TARGET/massa-client -p $WALLET_PWD sell_rolls $3 $NbRollsToSell 0 @@ -205,7 +205,7 @@ CheckNodeRam() { # If ram consumption is too high if [ $checkRam -gt $NODE_MAX_RAM ] then - echo "[$(date +%Y%m%d-%HH%M)][KO][NODE]RAM EXCEED - NODE WILL RESTART" >> $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt + echo "[$(date +%Y%m%d-%HH%M)][KO][NODE]RAM EXCEED - NODE WILL RESTART" |& tee -a $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt echo 1 return 1 # If ram consumption is ok @@ -228,7 +228,7 @@ CheckNodeResponsive() { # If get_status is responsive if [ $checkGetStatus -lt 10 ] then - echo "[$(date +%Y%m%d-%HH%M)][KO][NODE]TIMEOUT - NODE WILL RESTART" >> $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt + echo "[$(date +%Y%m%d-%HH%M)][KO][NODE]TIMEOUT - NODE WILL RESTART" |& tee -a $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt echo 1 return 1 # If get_status hang @@ -248,18 +248,22 @@ BackupLogsNode() { # If node backup log exist, add new current logs if [ -e $PATH_LOGS_MASSANODE/$(date +%Y%m%d)-logs.txt ] then - # Add node logs to backup logs of the current day - cat $PATH_NODE/logs.txt >> $PATH_LOGS_MASSANODE/$(date +%Y%m%d)-logs.txt - rm $PATH_NODE/logs.txt + # If node logs file exist + if [ -e $PATH_NODE/logs.txt ] + then + # Add node logs to backup logs of the current day + cat $PATH_NODE/logs.txt >> $PATH_LOGS_MASSANODE/$(date +%Y%m%d)-logs.txt + rm $PATH_NODE/logs.txt + fi # If node backup log dont exist, create new node backup logs else # Create node backup logs of the day - mv $PATH_NODE/logs.txt $PATH_LOGS_MASSANODE/$(date +%Y%m%d)-logs.txt + if [ -e $PATH_NODE/logs.txt ]; then mv $PATH_NODE/logs.txt $PATH_LOGS_MASSANODE/$(date +%Y%m%d)-logs.txt; else touch $PATH_LOGS_MASSANODE/$(date +%Y%m%d)-logs.txt; fi fi # Purge last current node log file in mount point if [ -e $PATH_LOGS_MASSANODE/current.txt ] then - rm $PATH_LOGS_MASSANODE/current.txt + if [ -e $PATH_LOGS_MASSANODE/current.txt ]; then rm $PATH_LOGS_MASSANODE/current.txt; fi fi # Create clean node logs file if [ ! -e $PATH_NODE/logs.txt ] @@ -324,7 +328,7 @@ PingFaucet() { then # Call python ping faucet script with token discord cd $PATH_CLIENT - python3 $PATH_SOURCES/faucet_spammer.py $DISCORD_TOKEN $WALLET_PWD >> $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt + python3 $PATH_SOURCES/faucet_spammer.py $DISCORD_TOKEN $WALLET_PWD |& tee -a $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt # Return ping done return 0 @@ -393,12 +397,12 @@ RefreshBootstrapNode() { then # Refresh bootstrap nodes list and logs returns RefreshUnreachableBootstrap - echo "[$(date +%Y%m%d-%HH%M)][INFO][BOOTSTRAP]Refresh availability of connected node to bootstrap" >> $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt + echo "[$(date +%Y%m%d-%HH%M)][INFO][BOOTSTRAP]Refresh availability of connected node to bootstrap" |& tee -a $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt fi # Refresh bootstrap nodes list and logs returns cd $PATH_CLIENT - python3 $PATH_SOURCES/bootstrap_finder.py $WALLET_PWD >> $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt + python3 $PATH_SOURCES/bootstrap_finder.py $WALLET_PWD |& tee -a $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt # Copy config.toml cp $PATH_MOUNT/config.toml $PATH_NODE_CONF/ @@ -445,12 +449,12 @@ RefreshPublicIP() { # Check massabot return if ($(cat $PATH_MASSABOT_REPLY | grep -q -e "IP address: $myIP")) then - echo "[$(date +%Y%m%d-%HH%M)][INFO][IP]Dynamique public IP changed, updated for $1 in config.toml and with massabot" >> $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt + echo "[$(date +%Y%m%d-%HH%M)][INFO][IP]Dynamique public IP changed, updated for $1 in config.toml and with massabot" |& tee -a $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt elif ($(cat $PATH_MASSABOT_REPLY | grep -q -e "wait for announcements!")) then - echo "[$(date +%Y%m%d-%HH%M)][WARN][IP]Unable to update registrered IP with massabot because testnet not start for now" >> $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt + echo "[$(date +%Y%m%d-%HH%M)][WARN][IP]Unable to update registrered IP with massabot because testnet not start for now" |& tee -a $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt else - echo "[$(date +%Y%m%d-%HH%M)][ERROR][IP]Unable to update registrered IP with massabot because massabot not or wrong responsive" >> $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt + echo "[$(date +%Y%m%d-%HH%M)][ERROR][IP]Unable to update registrered IP with massabot because massabot not or wrong responsive" |& tee -a $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt fi # Update IP in your ref config.toml and restart node @@ -488,7 +492,7 @@ RegisterNodeWithMassabot() { if cat $PATH_MASSABOT_REPLY | grep -q -E "Your discord account \`[0-9]{18}\` has been associated with this node ID" then - echo "[$(date +%Y%m%d-%HH%M)][INFO][REGISTRATION]Node is now register with discord ID $2 and massabot" >> $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt + echo "[$(date +%Y%m%d-%HH%M)][INFO][REGISTRATION]Node is now register with discord ID $2 and massabot" |& tee -a $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt python3 $PATH_SOURCES/set_config.py "NODE_TESTNET_REGISTRATION" \"OK\" $PATH_CONF_MASSAGUARD/config.ini return 0 else @@ -523,7 +527,7 @@ CheckTestnetNodeRegistration() { return 0 else # Return bot registration OK - echo "[$(date +%Y%m%d-%HH%M)][INFO][REGISTRATION]Node already associated with and massabot or registration is not already open" >> $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt + echo "[$(date +%Y%m%d-%HH%M)][INFO][REGISTRATION]Node already associated with and massabot or registration is not already open" |& tee -a $PATH_LOGS_MASSAGUARD/$(date +%Y%m%d)-massa_guard.txt python3 $PATH_SOURCES/set_config.py "NODE_TESTNET_REGISTRATION" \"OK\" $PATH_CONF_MASSAGUARD/config.ini return 0 fi