More cleanup fixes

develop
Dominik Dzienia 3 weeks ago
parent ed18d44d5f
commit 0f65830c5e

@ -19,7 +19,7 @@ show_watchdog_logs() {
{ {
echo "Ostatnie uruchomienie watchdoga:" echo "Ostatnie uruchomienie watchdoga:"
get_watchdog_age_string get_watchdog_age_string
echo "-------------------------------------------------------" hline
if [[ -f $WATCHDOG_LOG_FILE ]]; then if [[ -f $WATCHDOG_LOG_FILE ]]; then
echo "Statusy ostatnich przebiegów watchdoga:" echo "Statusy ostatnich przebiegów watchdoga:"
@ -27,7 +27,7 @@ show_watchdog_logs() {
else else
echo "Brak logów z ostatnich przebiegów watchdoga" echo "Brak logów z ostatnich przebiegów watchdoga"
fi fi
echo "-------------------------------------------------------" hline
if [[ -f $WATCHDOG_CRON_LOG ]]; then if [[ -f $WATCHDOG_CRON_LOG ]]; then
echo "Log ostatniego przebiegu watchdoga:" echo "Log ostatniego przebiegu watchdoga:"

@ -89,14 +89,14 @@ cleanup_stats() {
"\n Zajęte: ${fixedPerc} (z ${totalTxt})" "\n Zajęte: ${fixedPerc} (z ${totalTxt})"
)")\n" )")\n"
echo "\n---------------------------\n" hline
echo "$statusTitle" echo "${statusTitle/=/%}"
echo "\n---------------------------\n" hline
} }
do_cleanup_all() { do_cleanup_all() {
echo "Cleanup" echo "Cleanup"
echo "\n---------------------------\n" hline
do_cleanup_container_logs do_cleanup_container_logs
do_cleanup_sys do_cleanup_sys
do_cleanup_docker do_cleanup_docker

@ -239,7 +239,7 @@ watchdog_check() {
if [ "$WATCHDOG_STATUS" = "detection_failed" ]; then if [ "$WATCHDOG_STATUS" = "detection_failed" ]; then
{ {
echo "----------------------------------------------------------------" hline
echo "[$WATCHDOG_TIME] Unknown server failure:" echo "[$WATCHDOG_TIME] Unknown server failure:"
echo "CONTAINERS:" echo "CONTAINERS:"
docker stats --no-stream docker stats --no-stream

@ -76,6 +76,14 @@ msgdebug() {
fi fi
} }
hline() {
if [ "$NONINTERACTIVE_MODE" = "true" ]; then
printf "-------------------------------------------------------\n"
else
printf "${tty_bold}-------------------------------------------------------${tty_reset}\n"
fi
}
warn() { warn() {
if [ "$NONINTERACTIVE_MODE" = "true" ]; then if [ "$NONINTERACTIVE_MODE" = "true" ]; then
# shellcheck disable=SC2059 # shellcheck disable=SC2059

Loading…
Cancel
Save