From 1cd251847b2cb3c4c910b9d6d1f1cf84e510f234 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gardais=20J=C3=A9r=C3=A9my?=
 <jeremy.gardais@univ-rennes1.fr>
Date: Tue, 21 Aug 2018 08:48:44 +0200
Subject: [PATCH] Create log files and remove empty one at the end

---
 xymon/xymon.libs.alert.sh | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/xymon/xymon.libs.alert.sh b/xymon/xymon.libs.alert.sh
index 0970e7f..2387895 100755
--- a/xymon/xymon.libs.alert.sh
+++ b/xymon/xymon.libs.alert.sh
@@ -27,17 +27,14 @@ debug_stderr="${temp_dir}/debug.stderr"
 service_list="${temp_dir}/services.error.list"
 # }}}
 
-# Temp dir for this alert {{{
-if [ ! -d "${temp_dir}" ] ; then
-	mkdir -p -- "${temp_dir}"
-fi
-# }}}
+# Create log files
+touch "${debug_stdout}" "${debug_stderr}"
 
 # Manage only libs probe {{{
 if [ "${BBSVCNAME}" = "libs" ]; then
-	[ "${DEBUG}" -eq "0" ] && printf '\e[1;35m%-6s\e[m\n' "DEBUG : ${BBHOSTNAME} — ${BBSVCNAME} error" > "${debug_stdout}"
+	[ "${DEBUG}" -eq "0" ] && printf '\e[1;35m%-6s\e[m\n' "DEBUG : ${BBHOSTNAME} — ${BBSVCNAME} error" >> "${debug_stdout}"
 else
-	[ "${DEBUG}" -eq "0" ] && printf '\e[1;35m%-6s\e[m\n' "DEBUG : ${BBHOSTNAME} — ${BBSVCNAME} probe is not managed." > "${debug_stderr}"
+	[ "${DEBUG}" -eq "0" ] && printf '\e[1;35m%-6s\e[m\n' "DEBUG : ${BBHOSTNAME} — ${BBSVCNAME} probe is not managed." >> "${debug_stderr}"
 	[ "${DEBUG}" -eq "0" ] || rm -rf -- "${temp_dir}"
 	exit 0
 fi
@@ -108,7 +105,7 @@ if echo "${BBALPHAMSG}" | grep -qE "\\&yellow The following processes.*" ; then
 		else
 			[ "${DEBUG}" -eq "0" ] && printf '\e[1;35m%-6s\e[m\n' "DEBUG : while bin_path loop — ${service_name} need to be restarted." >> "${debug_stdout}"
 			[ "${DEBUG}" -eq "0" ] && printf '\e[1;35m%-6s\e[m\n' "DEBUG : while bin_path loop — ssh -o StrictHostKeyChecking=no ${REMOTE_SSH_USER}@${BBHOSTNAME} sudo systemctl restart ${service_name}.service" >> "${debug_stdout}"
-			ssh -o StrictHostKeyChecking=no ${REMOTE_SSH_USER}@${BBHOSTNAME} sudo systemctl restart ${service_name}.service >> "${debug_stdout}" 2> "${debug_stderr}"
+			ssh -o StrictHostKeyChecking=no ${REMOTE_SSH_USER}@${BBHOSTNAME} sudo systemctl restart ${service_name}.service >> "${debug_stdout}" 2>> "${debug_stderr}"
 		fi
 		# }}}
 	done < "${service_list}"
@@ -116,10 +113,14 @@ if echo "${BBALPHAMSG}" | grep -qE "\\&yellow The following processes.*" ; then
 	# Also restart xymon-client service {{{
 	[ "${DEBUG}" -eq "0" ] && printf '\e[1;35m%-6s\e[m\n' "DEBUG : Test service — xymon-client also need to be restarted." >> "${debug_stdout}"
 	[ "${DEBUG}" -eq "0" ] && printf '\e[1;35m%-6s\e[m\n' "DEBUG : Test service — ssh -o StrictHostKeyChecking=no ${REMOTE_SSH_USER}@${BBHOSTNAME} sudo systemctl restart xymon-client.service" >> "${debug_stdout}"
-	ssh -o StrictHostKeyChecking=no ${REMOTE_SSH_USER}@${BBHOSTNAME} sudo systemctl restart xymon-client.service >> "${debug_stdout}" 2> "${debug_stderr}"
+	ssh -o StrictHostKeyChecking=no ${REMOTE_SSH_USER}@${BBHOSTNAME} sudo systemctl restart xymon-client.service >> "${debug_stdout}" 2>> "${debug_stderr}"
 	# }}}
 fi
 
+# Remove empty error file
+[ -s "${debug_stderr}" ] || rm -f "${debug_stderr}"
+
+# Remove temp_dir if DEBUG is disable
 [ "${DEBUG}" -eq "0" ] || rm -rf -- "${temp_dir}"
 
 exit 0