From 7679ee27aee6cca210527e94de6faf13e6176193 Mon Sep 17 00:00:00 2001 From: PostgreSQL Server Date: Tue, 13 Mar 2018 15:28:38 +0300 Subject: [PATCH] bin/server-audit.sh: fix answer's overwrite at log parse when log size is big --- bin/server-audit.sh | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/bin/server-audit.sh b/bin/server-audit.sh index f1687f7..0d50782 100755 --- a/bin/server-audit.sh +++ b/bin/server-audit.sh @@ -301,14 +301,17 @@ if [[ $answer == "y" ]]; then else answer="y" # size is less than 2Gb and it's acceptable for us. fi - answer="" - if [[ $pgLcMessages != 'C' && $pgLcMessages != *"en_US"* ]]; then # print warning about the log size - while [[ $answer != "y" && $answer != "n" ]] - do - read -p "${red}PostgreSQL server's lc_messages is neither C nor en_US.UTF-8. ${yellow}Parse the log anyway? [y/n]: ${reset}" answer - done - else - answer="y" # no problem with lc_messages + + if [[ $answer == "y" ]]; then + answer="" + if [[ $pgLcMessages != 'C' && $pgLcMessages != *"en_US"* ]]; then # print warning about the log size + while [[ $answer != "y" && $answer != "n" ]] + do + read -p "${red}PostgreSQL server's lc_messages is neither C nor en_US.UTF-8. ${yellow}Parse the log anyway? [y/n]: ${reset}" answer + done + else + answer="y" # no problem with lc_messages + fi fi if [[ $answer == "y" ]]; then # we are ready to parse log @@ -316,6 +319,7 @@ if [[ $answer == "y" ]]; then if [[ $pvUtil == true ]]; then # handle log with pv pv --progress --timer --eta --bytes --width 100 --rate-limit $pvLimit $pgCompleteLogPath |grep -oE '(ERROR|WARNING|FATAL|PANIC).*' > $tempPgLog else # do it without pv + echo "answer: $answer" grep -oE '(ERROR|WARNING|FATAL|PANIC).*' $pgCompleteLogPath > $tempPgLog fi