diff --git a/tests/core/antibot/test.sh b/tests/core/antibot/test.sh index 80bf72dc4..712a49fe6 100755 --- a/tests/core/antibot/test.sh +++ b/tests/core/antibot/test.sh @@ -145,8 +145,7 @@ do retries=0 while [[ $healthy = "false" && $retries -lt 5 ]] ; do while [ $i -lt 120 ] ; do - check="$(sudo cat /var/log/bunkerweb/error.log | grep "BunkerWeb is ready")" - if ! [ -z "$check" ] ; then + if sudo grep -q "BunkerWeb is ready" "/var/log/bunkerweb/error.log" ; then echo "🤖 Linux stack is healthy ✅" break fi @@ -163,10 +162,11 @@ do exit 1 fi - check="$(sudo cat /var/log/bunkerweb/error.log | grep "SYSTEMCTL - ❌")" - if ! [ -z "$check" ] ; then + if sudo grep -q "SYSTEMCTL - ❌" "/var/log/bunkerweb/error.log" ; then echo "🤖 ⚠ Linux stack got an issue, restarting ..." - sudo systemctl stop bunkerweb + manual=1 + cleanup_stack + manual=0 sudo systemctl start bunkerweb retries=$((retries+1)) else diff --git a/tests/core/authbasic/test.sh b/tests/core/authbasic/test.sh index 10ed68dae..0db5c68a4 100755 --- a/tests/core/authbasic/test.sh +++ b/tests/core/authbasic/test.sh @@ -172,8 +172,7 @@ do retries=0 while [[ $healthy = "false" && $retries -lt 5 ]] ; do while [ $i -lt 120 ] ; do - check="$(sudo cat /var/log/bunkerweb/error.log | grep "BunkerWeb is ready")" - if ! [ -z "$check" ] ; then + if sudo grep -q "BunkerWeb is ready" "/var/log/bunkerweb/error.log" ; then echo "🔐 Linux stack is healthy ✅" break fi @@ -190,10 +189,11 @@ do exit 1 fi - check="$(sudo cat /var/log/bunkerweb/error.log | grep "SYSTEMCTL - ❌")" - if ! [ -z "$check" ] ; then + if sudo grep -q "SYSTEMCTL - ❌" "/var/log/bunkerweb/error.log" ; then echo "🔐 ⚠ Linux stack got an issue, restarting ..." - sudo systemctl stop bunkerweb + manual=1 + cleanup_stack + manual=0 sudo systemctl start bunkerweb retries=$((retries+1)) else diff --git a/tests/core/badbehavior/test.sh b/tests/core/badbehavior/test.sh index 5a88307ed..52200614e 100755 --- a/tests/core/badbehavior/test.sh +++ b/tests/core/badbehavior/test.sh @@ -195,8 +195,7 @@ do retries=0 while [[ $healthy = "false" && $retries -lt 5 ]] ; do while [ $i -lt 120 ] ; do - check="$(sudo cat /var/log/bunkerweb/error.log | grep "BunkerWeb is ready")" - if ! [ -z "$check" ] ; then + if sudo grep -q "BunkerWeb is ready" "/var/log/bunkerweb/error.log" ; then echo "📟 Linux stack is healthy ✅" break fi @@ -213,10 +212,11 @@ do exit 1 fi - check="$(sudo cat /var/log/bunkerweb/error.log | grep "SYSTEMCTL - ❌")" - if ! [ -z "$check" ] ; then + if sudo grep -q "SYSTEMCTL - ❌" "/var/log/bunkerweb/error.log" ; then echo "📟 ⚠ Linux stack got an issue, restarting ..." - sudo systemctl stop bunkerweb + manual=1 + cleanup_stack + manual=0 sudo systemctl start bunkerweb retries=$((retries+1)) else diff --git a/tests/core/blacklist/test.sh b/tests/core/blacklist/test.sh index 8e63e7cbd..d5cc62fd9 100755 --- a/tests/core/blacklist/test.sh +++ b/tests/core/blacklist/test.sh @@ -501,8 +501,7 @@ do retries=0 while [[ $healthy = "false" && $retries -lt 5 ]] ; do while [ $i -lt 120 ] ; do - check="$(sudo cat /var/log/bunkerweb/error.log | grep "BunkerWeb is ready")" - if ! [ -z "$check" ] ; then + if sudo grep -q "BunkerWeb is ready" "/var/log/bunkerweb/error.log" ; then echo "🏴 Linux stack is healthy ✅" break fi @@ -519,10 +518,11 @@ do exit 1 fi - check="$(sudo cat /var/log/bunkerweb/error.log | grep "SYSTEMCTL - ❌")" - if ! [ -z "$check" ] ; then + if sudo grep -q "SYSTEMCTL - ❌" "/var/log/bunkerweb/error.log" ; then echo "🏴 ⚠ Linux stack got an issue, restarting ..." - sudo systemctl stop bunkerweb + manual=1 + cleanup_stack + manual=0 sudo systemctl start bunkerweb retries=$((retries+1)) else diff --git a/tests/core/brotli/test.sh b/tests/core/brotli/test.sh index 820ce0885..05feb52f5 100755 --- a/tests/core/brotli/test.sh +++ b/tests/core/brotli/test.sh @@ -133,8 +133,7 @@ do retries=0 while [[ $healthy = "false" && $retries -lt 5 ]] ; do while [ $i -lt 120 ] ; do - check="$(sudo cat /var/log/bunkerweb/error.log | grep "BunkerWeb is ready")" - if ! [ -z "$check" ] ; then + if sudo grep -q "BunkerWeb is ready" "/var/log/bunkerweb/error.log" ; then echo "đŸ“Ļ Linux stack is healthy ✅" break fi @@ -151,10 +150,11 @@ do exit 1 fi - check="$(sudo cat /var/log/bunkerweb/error.log | grep "SYSTEMCTL - ❌")" - if ! [ -z "$check" ] ; then + if sudo grep -q "SYSTEMCTL - ❌" "/var/log/bunkerweb/error.log" ; then echo "đŸ“Ļ ⚠ Linux stack got an issue, restarting ..." - sudo systemctl stop bunkerweb + manual=1 + cleanup_stack + manual=0 sudo systemctl start bunkerweb retries=$((retries+1)) else diff --git a/tests/core/bunkernet/test.sh b/tests/core/bunkernet/test.sh index 134d39a6e..c0d5b14a6 100755 --- a/tests/core/bunkernet/test.sh +++ b/tests/core/bunkernet/test.sh @@ -150,8 +150,7 @@ do retries=0 while [[ $healthy = "false" && $retries -lt 5 ]] ; do while [ $i -lt 120 ] ; do - check="$(sudo cat /var/log/bunkerweb/error.log | grep "BunkerWeb is ready")" - if ! [ -z "$check" ] ; then + if sudo grep -q "BunkerWeb is ready" "/var/log/bunkerweb/error.log" ; then echo "🕸ī¸ Linux stack is healthy ✅" break fi @@ -168,10 +167,11 @@ do exit 1 fi - check="$(sudo cat /var/log/bunkerweb/error.log | grep "SYSTEMCTL - ❌")" - if ! [ -z "$check" ] ; then + if sudo grep -q "SYSTEMCTL - ❌" "/var/log/bunkerweb/error.log" ; then echo "🕸ī¸ ⚠ Linux stack got an issue, restarting ..." - sudo systemctl stop bunkerweb + manual=1 + cleanup_stack + manual=0 sudo systemctl start bunkerweb retries=$((retries+1)) else diff --git a/tests/core/bwcli/test.sh b/tests/core/bwcli/test.sh index 628b25461..125046416 100755 --- a/tests/core/bwcli/test.sh +++ b/tests/core/bwcli/test.sh @@ -120,8 +120,7 @@ else retries=0 while [[ $healthy = "false" && $retries -lt 5 ]] ; do while [ $i -lt 120 ] ; do - check="$(sudo cat /var/log/bunkerweb/error.log | grep "BunkerWeb is ready")" - if ! [ -z "$check" ] ; then + if sudo grep -q "BunkerWeb is ready" "/var/log/bunkerweb/error.log" ; then echo "⌨ī¸ Linux stack is healthy ✅" break fi @@ -138,10 +137,11 @@ else exit 1 fi - check="$(sudo cat /var/log/bunkerweb/error.log | grep "SYSTEMCTL - ❌")" - if ! [ -z "$check" ] ; then + if sudo grep -q "SYSTEMCTL - ❌" "/var/log/bunkerweb/error.log" ; then echo "⌨ī¸ ⚠ Linux stack got an issue, restarting ..." - sudo systemctl stop bunkerweb + manual=1 + cleanup_stack + manual=0 sudo systemctl start bunkerweb retries=$((retries+1)) else diff --git a/tests/core/clientcache/test.sh b/tests/core/clientcache/test.sh index 58f2f14bc..e30ca43be 100755 --- a/tests/core/clientcache/test.sh +++ b/tests/core/clientcache/test.sh @@ -176,8 +176,7 @@ do retries=0 while [[ $healthy = "false" && $retries -lt 5 ]] ; do while [ $i -lt 120 ] ; do - check="$(sudo cat /var/log/bunkerweb/error.log | grep "BunkerWeb is ready")" - if ! [ -z "$check" ] ; then + if sudo grep -q "BunkerWeb is ready" "/var/log/bunkerweb/error.log" ; then echo "📝 Linux stack is healthy ✅" break fi @@ -194,10 +193,11 @@ do exit 1 fi - check="$(sudo cat /var/log/bunkerweb/error.log | grep "SYSTEMCTL - ❌")" - if ! [ -z "$check" ] ; then + if sudo grep -q "SYSTEMCTL - ❌" "/var/log/bunkerweb/error.log" ; then echo "📝 ⚠ Linux stack got an issue, restarting ..." - sudo systemctl stop bunkerweb + manual=1 + cleanup_stack + manual=0 sudo systemctl start bunkerweb retries=$((retries+1)) else diff --git a/tests/core/cors/test.sh b/tests/core/cors/test.sh index b3569a4be..ee24ab6f6 100755 --- a/tests/core/cors/test.sh +++ b/tests/core/cors/test.sh @@ -213,8 +213,7 @@ do retries=0 while [[ $healthy = "false" && $retries -lt 5 ]] ; do while [ $i -lt 120 ] ; do - check="$(sudo cat /var/log/bunkerweb/error.log | grep "BunkerWeb is ready")" - if ! [ -z "$check" ] ; then + if sudo grep -q "BunkerWeb is ready" "/var/log/bunkerweb/error.log" ; then echo "🛰ī¸ Linux stack is healthy ✅" break fi @@ -231,10 +230,11 @@ do exit 1 fi - check="$(sudo cat /var/log/bunkerweb/error.log | grep "SYSTEMCTL - ❌")" - if ! [ -z "$check" ] ; then + if sudo grep -q "SYSTEMCTL - ❌" "/var/log/bunkerweb/error.log" ; then echo "🛰ī¸ ⚠ Linux stack got an issue, restarting ..." - sudo systemctl stop bunkerweb + manual=1 + cleanup_stack + manual=0 sudo systemctl start bunkerweb retries=$((retries+1)) else diff --git a/tests/core/country/test.sh b/tests/core/country/test.sh index 68c9f322f..a5deecd72 100755 --- a/tests/core/country/test.sh +++ b/tests/core/country/test.sh @@ -153,8 +153,7 @@ do retries=0 while [[ $healthy = "false" && $retries -lt 5 ]] ; do while [ $i -lt 120 ] ; do - check="$(sudo cat /var/log/bunkerweb/error.log | grep "BunkerWeb is ready")" - if ! [ -z "$check" ] ; then + if sudo grep -q "BunkerWeb is ready" "/var/log/bunkerweb/error.log" ; then echo "🌍 Linux stack is healthy ✅" break fi @@ -171,10 +170,11 @@ do exit 1 fi - check="$(sudo cat /var/log/bunkerweb/error.log | grep "SYSTEMCTL - ❌")" - if ! [ -z "$check" ] ; then + if sudo grep -q "SYSTEMCTL - ❌" "/var/log/bunkerweb/error.log" ; then echo "🌍 ⚠ Linux stack got an issue, restarting ..." - sudo systemctl stop bunkerweb + manual=1 + cleanup_stack + manual=0 sudo systemctl start bunkerweb retries=$((retries+1)) else diff --git a/tests/core/customcert/test.sh b/tests/core/customcert/test.sh index 6c5df079f..ce410cdfc 100755 --- a/tests/core/customcert/test.sh +++ b/tests/core/customcert/test.sh @@ -164,8 +164,7 @@ do retries=0 while [[ $healthy = "false" && $retries -lt 5 ]] ; do while [ $i -lt 120 ] ; do - check="$(sudo cat /var/log/bunkerweb/error.log | grep "BunkerWeb is ready")" - if ! [ -z "$check" ] ; then + if sudo grep -q "BunkerWeb is ready" "/var/log/bunkerweb/error.log" ; then echo "🔏 Linux stack is healthy ✅" break fi @@ -182,10 +181,11 @@ do exit 1 fi - check="$(sudo cat /var/log/bunkerweb/error.log | grep "SYSTEMCTL - ❌")" - if ! [ -z "$check" ] ; then + if sudo grep -q "SYSTEMCTL - ❌" "/var/log/bunkerweb/error.log" ; then echo "🔏 ⚠ Linux stack got an issue, restarting ..." - sudo systemctl stop bunkerweb + manual=1 + cleanup_stack + manual=0 sudo systemctl start bunkerweb retries=$((retries+1)) else diff --git a/tests/core/db/test.sh b/tests/core/db/test.sh index 1733cd284..21319a3c8 100755 --- a/tests/core/db/test.sh +++ b/tests/core/db/test.sh @@ -388,8 +388,7 @@ do retries=0 while [[ $healthy = "false" && $retries -lt 5 ]] ; do while [ $i -lt 120 ] ; do - check="$(sudo cat /var/log/bunkerweb/error.log | grep "BunkerWeb is ready")" - if ! [ -z "$check" ] ; then + if sudo grep -q "BunkerWeb is ready" "/var/log/bunkerweb/error.log" ; then echo "💾 Linux stack is healthy ✅" break fi @@ -406,10 +405,11 @@ do exit 1 fi - check="$(sudo cat /var/log/bunkerweb/error.log | grep "SYSTEMCTL - ❌")" - if ! [ -z "$check" ] ; then + if sudo grep -q "SYSTEMCTL - ❌" "/var/log/bunkerweb/error.log" ; then echo "💾 ⚠ Linux stack got an issue, restarting ..." - sudo systemctl stop bunkerweb + manual=1 + cleanup_stack + manual=0 sudo systemctl start bunkerweb retries=$((retries+1)) else diff --git a/tests/core/dnsbl/test.sh b/tests/core/dnsbl/test.sh index c44518039..f97a9ee3b 100755 --- a/tests/core/dnsbl/test.sh +++ b/tests/core/dnsbl/test.sh @@ -199,8 +199,7 @@ do retries=0 while [[ $healthy = "false" && $retries -lt 5 ]] ; do while [ $i -lt 120 ] ; do - check="$(sudo cat /var/log/bunkerweb/error.log | grep "BunkerWeb is ready")" - if ! [ -z "$check" ] ; then + if sudo grep -q "BunkerWeb is ready" "/var/log/bunkerweb/error.log" ; then echo "đŸšĢ Linux stack is healthy ✅" break fi @@ -217,10 +216,18 @@ do exit 1 fi - check="$(sudo cat /var/log/bunkerweb/error.log | grep "SYSTEMCTL - ❌")" - if ! [ -z "$check" ] ; then + if sudo grep -q "SYSTEMCTL - ❌" "/var/log/bunkerweb/error.log" ; then echo "đŸšĢ ⚠ Linux stack got an issue, restarting ..." - sudo systemctl stop bunkerweb + manual=1 + cleanup_stack + manual=0 + sudo systemctl start bunkerweb + retries=$((retries+1)) + elif sudo grep -q "dnsbl check for $server failed" "/var/log/bunkerweb/error.log" ; then + echo "đŸšĢ ⚠ Couldn't check DNSBL server $server, restarting ..." + manual=1 + cleanup_stack + manual=0 sudo systemctl start bunkerweb retries=$((retries+1)) else diff --git a/tests/core/errors/test.sh b/tests/core/errors/test.sh index b02a5b8a7..5bf982f3f 100755 --- a/tests/core/errors/test.sh +++ b/tests/core/errors/test.sh @@ -150,8 +150,7 @@ do retries=0 while [[ $healthy = "false" && $retries -lt 5 ]] ; do while [ $i -lt 120 ] ; do - check="$(sudo cat /var/log/bunkerweb/error.log | grep "BunkerWeb is ready")" - if ! [ -z "$check" ] ; then + if sudo grep -q "BunkerWeb is ready" "/var/log/bunkerweb/error.log" ; then echo "⭕ Linux stack is healthy ✅" break fi @@ -168,10 +167,11 @@ do exit 1 fi - check="$(sudo cat /var/log/bunkerweb/error.log | grep "SYSTEMCTL - ❌")" - if ! [ -z "$check" ] ; then + if sudo grep -q "SYSTEMCTL - ❌" "/var/log/bunkerweb/error.log" ; then echo "⭕ ⚠ Linux stack got an issue, restarting ..." - sudo systemctl stop bunkerweb + manual=1 + cleanup_stack + manual=0 sudo systemctl start bunkerweb retries=$((retries+1)) else diff --git a/tests/core/greylist/test.sh b/tests/core/greylist/test.sh index 0bc348b21..613228ed7 100755 --- a/tests/core/greylist/test.sh +++ b/tests/core/greylist/test.sh @@ -341,8 +341,7 @@ do retries=0 while [[ $healthy = "false" && $retries -lt 5 ]] ; do while [ $i -lt 120 ] ; do - check="$(sudo cat /var/log/bunkerweb/error.log | grep "BunkerWeb is ready")" - if ! [ -z "$check" ] ; then + if sudo grep -q "BunkerWeb is ready" "/var/log/bunkerweb/error.log" ; then echo "🏁 Linux stack is healthy ✅" break fi @@ -359,10 +358,11 @@ do exit 1 fi - check="$(sudo cat /var/log/bunkerweb/error.log | grep "SYSTEMCTL - ❌")" - if ! [ -z "$check" ] ; then + if sudo grep -q "SYSTEMCTL - ❌" "/var/log/bunkerweb/error.log" ; then echo "🏁 ⚠ Linux stack got an issue, restarting ..." - sudo systemctl stop bunkerweb + manual=1 + cleanup_stack + manual=0 sudo systemctl start bunkerweb retries=$((retries+1)) else diff --git a/tests/core/gzip/test.sh b/tests/core/gzip/test.sh index 38240272b..9a2631483 100755 --- a/tests/core/gzip/test.sh +++ b/tests/core/gzip/test.sh @@ -133,8 +133,7 @@ do retries=0 while [[ $healthy = "false" && $retries -lt 5 ]] ; do while [ $i -lt 120 ] ; do - check="$(sudo cat /var/log/bunkerweb/error.log | grep "BunkerWeb is ready")" - if ! [ -z "$check" ] ; then + if sudo grep -q "BunkerWeb is ready" "/var/log/bunkerweb/error.log" ; then echo "🗜ī¸ Linux stack is healthy ✅" break fi @@ -151,10 +150,11 @@ do exit 1 fi - check="$(sudo cat /var/log/bunkerweb/error.log | grep "SYSTEMCTL - ❌")" - if ! [ -z "$check" ] ; then + if sudo grep -q "SYSTEMCTL - ❌" "/var/log/bunkerweb/error.log" ; then echo "🗜ī¸ ⚠ Linux stack got an issue, restarting ..." - sudo systemctl stop bunkerweb + manual=1 + cleanup_stack + manual=0 sudo systemctl start bunkerweb retries=$((retries+1)) else diff --git a/tests/core/headers/test.sh b/tests/core/headers/test.sh index 97d49c045..dd1ccb5d8 100755 --- a/tests/core/headers/test.sh +++ b/tests/core/headers/test.sh @@ -297,8 +297,7 @@ do retries=0 while [[ $healthy = "false" && $retries -lt 5 ]] ; do while [ $i -lt 120 ] ; do - check="$(sudo cat /var/log/bunkerweb/error.log | grep "BunkerWeb is ready")" - if ! [ -z "$check" ] ; then + if sudo grep -q "BunkerWeb is ready" "/var/log/bunkerweb/error.log" ; then echo "🎛ī¸ Linux stack is healthy ✅" break fi @@ -315,10 +314,11 @@ do exit 1 fi - check="$(sudo cat /var/log/bunkerweb/error.log | grep "SYSTEMCTL - ❌")" - if ! [ -z "$check" ] ; then + if sudo grep -q "SYSTEMCTL - ❌" "/var/log/bunkerweb/error.log" ; then echo "🎛ī¸ ⚠ Linux stack got an issue, restarting ..." - sudo systemctl stop bunkerweb + manual=1 + cleanup_stack + manual=0 sudo systemctl start bunkerweb retries=$((retries+1)) else diff --git a/tests/core/inject/test.sh b/tests/core/inject/test.sh index 337afc130..fed5b3ad9 100755 --- a/tests/core/inject/test.sh +++ b/tests/core/inject/test.sh @@ -106,8 +106,7 @@ else retries=0 while [[ $healthy = "false" && $retries -lt 5 ]] ; do while [ $i -lt 120 ] ; do - check="$(sudo cat /var/log/bunkerweb/error.log | grep "BunkerWeb is ready")" - if ! [ -z "$check" ] ; then + if sudo grep -q "BunkerWeb is ready" "/var/log/bunkerweb/error.log" ; then echo "💉 Linux stack is healthy ✅" break fi @@ -124,10 +123,11 @@ else exit 1 fi - check="$(sudo cat /var/log/bunkerweb/error.log | grep "SYSTEMCTL - ❌")" - if ! [ -z "$check" ] ; then + if sudo grep -q "SYSTEMCTL - ❌" "/var/log/bunkerweb/error.log" ; then echo "💉 ⚠ Linux stack got an issue, restarting ..." - sudo systemctl stop bunkerweb + manual=1 + cleanup_stack + manual=0 sudo systemctl start bunkerweb retries=$((retries+1)) else diff --git a/tests/core/limit/test.sh b/tests/core/limit/test.sh index 98fe5319a..e849da4b3 100755 --- a/tests/core/limit/test.sh +++ b/tests/core/limit/test.sh @@ -207,8 +207,7 @@ do retries=0 while [[ $healthy = "false" && $retries -lt 5 ]] ; do while [ $i -lt 120 ] ; do - check="$(sudo cat /var/log/bunkerweb/error.log | grep "BunkerWeb is ready")" - if ! [ -z "$check" ] ; then + if sudo grep -q "BunkerWeb is ready" "/var/log/bunkerweb/error.log" ; then echo "🎚ī¸ Linux stack is healthy ✅" break fi @@ -225,10 +224,11 @@ do exit 1 fi - check="$(sudo cat /var/log/bunkerweb/error.log | grep "SYSTEMCTL - ❌")" - if ! [ -z "$check" ] ; then + if sudo grep -q "SYSTEMCTL - ❌" "/var/log/bunkerweb/error.log" ; then echo "🎚ī¸ ⚠ Linux stack got an issue, restarting ..." - sudo systemctl stop bunkerweb + manual=1 + cleanup_stack + manual=0 sudo systemctl start bunkerweb retries=$((retries+1)) else diff --git a/tests/core/misc/test.sh b/tests/core/misc/test.sh index 9eb2e667f..ecde7176a 100755 --- a/tests/core/misc/test.sh +++ b/tests/core/misc/test.sh @@ -215,8 +215,7 @@ do retries=0 while [[ $healthy = "false" && $retries -lt 5 ]] ; do while [ $i -lt 120 ] ; do - check="$(sudo cat /var/log/bunkerweb/error.log | grep "BunkerWeb is ready")" - if ! [ -z "$check" ] ; then + if sudo grep -q "BunkerWeb is ready" "/var/log/bunkerweb/error.log" ; then echo "🗃ī¸ Linux stack is healthy ✅" break fi @@ -233,10 +232,11 @@ do exit 1 fi - check="$(sudo cat /var/log/bunkerweb/error.log | grep "SYSTEMCTL - ❌")" - if ! [ -z "$check" ] ; then + if sudo grep -q "SYSTEMCTL - ❌" "/var/log/bunkerweb/error.log" ; then echo "🗃ī¸ ⚠ Linux stack got an issue, restarting ..." - sudo systemctl stop bunkerweb + manual=1 + cleanup_stack + manual=0 sudo systemctl start bunkerweb retries=$((retries+1)) else diff --git a/tests/core/modsecurity/test.sh b/tests/core/modsecurity/test.sh index 3bc3785a0..206945c0e 100755 --- a/tests/core/modsecurity/test.sh +++ b/tests/core/modsecurity/test.sh @@ -151,8 +151,7 @@ do retries=0 while [[ $healthy = "false" && $retries -lt 5 ]] ; do while [ $i -lt 120 ] ; do - check="$(sudo cat /var/log/bunkerweb/error.log | grep "BunkerWeb is ready")" - if ! [ -z "$check" ] ; then + if sudo grep -q "BunkerWeb is ready" "/var/log/bunkerweb/error.log" ; then echo "👮 Linux stack is healthy ✅" break fi @@ -169,10 +168,11 @@ do exit 1 fi - check="$(sudo cat /var/log/bunkerweb/error.log | grep "SYSTEMCTL - ❌")" - if ! [ -z "$check" ] ; then + if sudo grep -q "SYSTEMCTL - ❌" "/var/log/bunkerweb/error.log" ; then echo "👮 ⚠ Linux stack got an issue, restarting ..." - sudo systemctl stop bunkerweb + manual=1 + cleanup_stack + manual=0 sudo systemctl start bunkerweb retries=$((retries+1)) else diff --git a/tests/core/redirect/test.sh b/tests/core/redirect/test.sh index 68be931bc..172e07543 100755 --- a/tests/core/redirect/test.sh +++ b/tests/core/redirect/test.sh @@ -143,8 +143,7 @@ do retries=0 while [[ $healthy = "false" && $retries -lt 5 ]] ; do while [ $i -lt 120 ] ; do - check="$(sudo cat /var/log/bunkerweb/error.log | grep "BunkerWeb is ready")" - if ! [ -z "$check" ] ; then + if sudo grep -q "BunkerWeb is ready" "/var/log/bunkerweb/error.log" ; then echo "↩ī¸ Linux stack is healthy ✅" break fi @@ -161,10 +160,11 @@ do exit 1 fi - check="$(sudo cat /var/log/bunkerweb/error.log | grep "SYSTEMCTL - ❌")" - if ! [ -z "$check" ] ; then + if sudo grep -q "SYSTEMCTL - ❌" "/var/log/bunkerweb/error.log" ; then echo "↩ī¸ ⚠ Linux stack got an issue, restarting ..." - sudo systemctl stop bunkerweb + manual=1 + cleanup_stack + manual=0 sudo systemctl start bunkerweb retries=$((retries+1)) else diff --git a/tests/core/redis/test.sh b/tests/core/redis/test.sh index 7ff86e583..abe2bf6ea 100755 --- a/tests/core/redis/test.sh +++ b/tests/core/redis/test.sh @@ -68,7 +68,7 @@ else -out tls/redis.pem \ -days 365 \ -subj /CN=bw-redis/ - sudo chmod -R 640 tls + sudo chmod -R 777 tls echo "🧰 Certs generated ✅" echo "USE_REDIS=yes" | sudo tee -a /etc/bunkerweb/variables.env @@ -103,6 +103,7 @@ cleanup_stack () { unset REDIS_PORT unset REDIS_DATABASE unset REDIS_SSL + sudo killall redis-server fi if [[ $end -eq 1 && $exit_code = 0 ]] ; then return @@ -170,7 +171,7 @@ do export REDIS_SSL="yes" echo "🧰 Stoping redis ..." - redis-cli shutdown + sudo killall redis-server if [ $? -ne 0 ] ; then echo "🧰 Redis stop failed ❌" exit 1 @@ -239,8 +240,7 @@ do retries=0 while [[ $healthy = "false" && $retries -lt 5 ]] ; do while [ $i -lt 120 ] ; do - check="$(sudo cat /var/log/bunkerweb/error.log | grep "BunkerWeb is ready")" - if ! [ -z "$check" ] ; then + if sudo grep -q "BunkerWeb is ready" "/var/log/bunkerweb/error.log" ; then echo "🧰 Linux stack is healthy ✅" break fi @@ -257,10 +257,11 @@ do exit 1 fi - check="$(sudo cat /var/log/bunkerweb/error.log | grep "SYSTEMCTL - ❌")" - if ! [ -z "$check" ] ; then + if sudo grep -q "SYSTEMCTL - ❌" "/var/log/bunkerweb/error.log" ; then echo "🧰 ⚠ Linux stack got an issue, restarting ..." - sudo systemctl stop bunkerweb + manual=1 + cleanup_stack + manual=0 sudo systemctl start bunkerweb retries=$((retries+1)) else diff --git a/tests/core/reversescan/test.sh b/tests/core/reversescan/test.sh index 775952096..f7df03c65 100755 --- a/tests/core/reversescan/test.sh +++ b/tests/core/reversescan/test.sh @@ -147,8 +147,7 @@ do retries=0 while [[ $healthy = "false" && $retries -lt 5 ]] ; do while [ $i -lt 120 ] ; do - check="$(sudo cat /var/log/bunkerweb/error.log | grep "BunkerWeb is ready")" - if ! [ -z "$check" ] ; then + if sudo grep -q "BunkerWeb is ready" "/var/log/bunkerweb/error.log" ; then echo "đŸ•ĩī¸ Linux stack is healthy ✅" break fi @@ -165,10 +164,11 @@ do exit 1 fi - check="$(sudo cat /var/log/bunkerweb/error.log | grep "SYSTEMCTL - ❌")" - if ! [ -z "$check" ] ; then + if sudo grep -q "SYSTEMCTL - ❌" "/var/log/bunkerweb/error.log" ; then echo "đŸ•ĩī¸ ⚠ Linux stack got an issue, restarting ..." - sudo systemctl stop bunkerweb + manual=1 + cleanup_stack + manual=0 sudo systemctl start bunkerweb retries=$((retries+1)) else diff --git a/tests/core/selfsigned/test.sh b/tests/core/selfsigned/test.sh index eb339a71a..d3be755f3 100755 --- a/tests/core/selfsigned/test.sh +++ b/tests/core/selfsigned/test.sh @@ -153,8 +153,7 @@ do retries=0 while [[ $healthy = "false" && $retries -lt 5 ]] ; do while [ $i -lt 120 ] ; do - check="$(sudo cat /var/log/bunkerweb/error.log | grep "BunkerWeb is ready")" - if ! [ -z "$check" ] ; then + if sudo grep -q "BunkerWeb is ready" "/var/log/bunkerweb/error.log" ; then echo "🔑 Linux stack is healthy ✅" break fi @@ -171,10 +170,11 @@ do exit 1 fi - check="$(sudo cat /var/log/bunkerweb/error.log | grep "SYSTEMCTL - ❌")" - if ! [ -z "$check" ] ; then + if sudo grep -q "SYSTEMCTL - ❌" "/var/log/bunkerweb/error.log" ; then echo "🔑 ⚠ Linux stack got an issue, restarting ..." - sudo systemctl stop bunkerweb + manual=1 + cleanup_stack + manual=0 sudo systemctl start bunkerweb retries=$((retries+1)) else diff --git a/tests/core/sessions/test.sh b/tests/core/sessions/test.sh index 4bda0ac90..0035bf148 100755 --- a/tests/core/sessions/test.sh +++ b/tests/core/sessions/test.sh @@ -150,8 +150,7 @@ do retries=0 while [[ $healthy = "false" && $retries -lt 5 ]] ; do while [ $i -lt 120 ] ; do - check="$(sudo cat /var/log/bunkerweb/error.log | grep "BunkerWeb is ready")" - if ! [ -z "$check" ] ; then + if sudo grep -q "BunkerWeb is ready" "/var/log/bunkerweb/error.log" ; then echo "đŸ§ŗ Linux stack is healthy ✅" break fi @@ -168,10 +167,11 @@ do exit 1 fi - check="$(sudo cat /var/log/bunkerweb/error.log | grep "SYSTEMCTL - ❌")" - if ! [ -z "$check" ] ; then + if sudo grep -q "SYSTEMCTL - ❌" "/var/log/bunkerweb/error.log" ; then echo "đŸ§ŗ ⚠ Linux stack got an issue, restarting ..." - sudo systemctl stop bunkerweb + manual=1 + cleanup_stack + manual=0 sudo systemctl start bunkerweb retries=$((retries+1)) else diff --git a/tests/core/whitelist/test.sh b/tests/core/whitelist/test.sh index 62b29f704..2f15c7704 100755 --- a/tests/core/whitelist/test.sh +++ b/tests/core/whitelist/test.sh @@ -345,8 +345,7 @@ do retries=0 while [[ $healthy = "false" && $retries -lt 5 ]] ; do while [ $i -lt 120 ] ; do - check="$(sudo cat /var/log/bunkerweb/error.log | grep "BunkerWeb is ready")" - if ! [ -z "$check" ] ; then + if sudo grep -q "BunkerWeb is ready" "/var/log/bunkerweb/error.log" ; then echo "đŸŗī¸ Linux stack is healthy ✅" break fi @@ -363,10 +362,11 @@ do exit 1 fi - check="$(sudo cat /var/log/bunkerweb/error.log | grep "SYSTEMCTL - ❌")" - if ! [ -z "$check" ] ; then + if sudo grep -q "SYSTEMCTL - ❌" "/var/log/bunkerweb/error.log" ; then echo "đŸŗī¸ ⚠ Linux stack got an issue, restarting ..." - sudo systemctl stop bunkerweb + manual=1 + cleanup_stack + manual=0 sudo systemctl start bunkerweb retries=$((retries+1)) else