nev/minecraft-backup
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve debug logging

Browse source
This commit is contained in:
Nicolas Chan 2021-03-03 23:19:55 -08:00
parent 1402cfd86a
commit 6495870e1a
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
backup.sh
View file

@ -32,6 +32,11 @@ log-fatal () {
log-warning () { log-warning () {
echo -e "\033[0;33mWARNING:\033[0m $*" echo -e "\033[0;33mWARNING:\033[0m $*"
} }
debug-log () {
if "$DEBUG"; then
echo "$1"
fi
}
while getopts 'a:cd:e:f:hi:l:m:o:p:qs:vw:' FLAG; do while getopts 'a:cd:e:f:hi:l:m:o:p:qs:vw:' FLAG; do
case $FLAG in case $FLAG in
@ -175,7 +180,7 @@ rcon-command () {
exec 3<>/dev/tcp/"$HOST"/"$PORT" exec 3<>/dev/tcp/"$HOST"/"$PORT"
login "$PASSWORD" || return 1 login "$PASSWORD" || return 1
run-command "$COMMAND" debug-log "$(run-command "$COMMAND")"
# Close the socket # Close the socket
exec 3<&- exec 3<&-
@ -243,9 +248,7 @@ message-players-color () {
local MESSAGE=$1 local MESSAGE=$1
local HOVER_MESSAGE=$2 local HOVER_MESSAGE=$2
local COLOR=$3 local COLOR=$3
if $DEBUG; then debug-log "$MESSAGE ($HOVER_MESSAGE)"
echo "$MESSAGE ($HOVER_MESSAGE)"
fi
if $ENABLE_CHAT_MESSAGES; then if $ENABLE_CHAT_MESSAGES; then
execute-command "tellraw @a [\"\",{\"text\":\"[$PREFIX] \",\"color\":\"gray\",\"italic\":true},{\"text\":\"$MESSAGE\",\"color\":\"$COLOR\",\"italic\":true,\"hoverEvent\":{\"action\":\"show_text\",\"value\":{\"text\":\"\",\"extra\":[{\"text\":\"$HOVER_MESSAGE\"}]}}}]" execute-command "tellraw @a [\"\",{\"text\":\"[$PREFIX] \",\"color\":\"gray\",\"italic\":true},{\"text\":\"$MESSAGE\",\"color\":\"$COLOR\",\"italic\":true,\"hoverEvent\":{\"action\":\"show_text\",\"value\":{\"text\":\"\",\"extra\":[{\"text\":\"$HOVER_MESSAGE\"}]}}}]"
fi fi
@ -342,9 +345,7 @@ delete-thinning () {
if $BLOCK_COMMAND; then if $BLOCK_COMMAND; then
# Oldest backup in this block satisfies the condition for placement in the next block # Oldest backup in this block satisfies the condition for placement in the next block
if $DEBUG; then debug-log "$OLDEST_BACKUP_IN_BLOCK promoted to next block"
echo "$OLDEST_BACKUP_IN_BLOCK promoted to next block"
fi
else else
# Oldest backup in this block does not satisfy the condition for placement in next block # Oldest backup in this block does not satisfy the condition for placement in next block
delete-backup "$OLDEST_BACKUP_IN_BLOCK" delete-backup "$OLDEST_BACKUP_IN_BLOCK"