Daniel Gibbs 10 лет назад
Родитель
Сommit
82686dc616
2 измененных файлов с 6 добавлено и 6 удалено
  1. 4 4
      lgsm/functions/alert.sh
  2. 2 2
      lgsm/functions/alert_email.sh

+ 4 - 4
lgsm/functions/alert.sh

@@ -46,19 +46,19 @@ fi
 if [ "${emailnotification}" == "on" ]||[ "${emailalert}" == "on" ]&&[ -n "${email}" ]; then
 	alert_email.sh
 elif [ "${emailnotification}" != "on" ]||[ "${emailalert}" != "on" ]&&[ "${selfname}" == "command_test_alert.sh" ]; then
-	fn_print_warn "Email alerts not enabled"
+	fn_print_warn_nl "Email alerts not enabled"
 	fn_script_log_warn "Email alerts not enabled"
 elif [ -z "${email}" ]&&[ "${selfname}" == "command_test_alert.sh" ]; then
-	fn_print_error "Email not set"
+	fn_print_error_nl "Email not set"
 	fn_script_log_error "Email not set"
 fi
 
 if [ "${pushbulletalert}" == "on" ]&&[ -n "${pushbullettoken}" ]; then
 	alert_pushbullet.sh
 elif [ "${pushbulletalert}" != "on" ]&&[ "${selfname}" == "command_test_alert.sh" ]; then
-	fn_print_warn "Pushbullet alerts not enabled"
+	fn_print_warn_nl "Pushbullet alerts not enabled"
 	fn_script_log_warn "Pushbullet alerts not enabled"
 elif [ -z "${pushbullettoken}" ]&&[ "${selfname}" == "command_test_alert.sh" ]; then
-	fn_print_error "Pushbullet token not set"
+	fn_print_error_nl "Pushbullet token not set"
 	fn_script_error_warn "Pushbullet token not set"
 fi

+ 2 - 2
lgsm/functions/alert_email.sh

@@ -233,9 +233,9 @@ fn_alert_email_template_logs
 mail -s "${alertsubject}" "${email}" < "${emaillog}"
 exitcode=$?
 if [ "${exitcode}" == "0" ]; then
-	fn_print_ok "Sending alert: ${email}"
+	fn_print_ok_nl "Sending alert: ${email}"
 	fn_script_log_pass "Sending alert: ${email}"
 else
-	fn_print_fail "Sending alert: ${email}"
+	fn_print_fail_nl "Sending alert: ${email}"
 	fn_script_log_fatal "Sending alert: ${email}"
 fi