From b33132ea5ecf7dd90db38255dacb2f894a8ac4f5 Mon Sep 17 00:00:00 2001 From: "Kay Marquardt (Gnadelwartz)" Date: Mon, 15 Jun 2020 20:07:43 +0200 Subject: [PATCH] inform dot admin about stop, resume, restart --- bashbot.sh | 5 ++++- modules/background.sh | 13 +++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/bashbot.sh b/bashbot.sh index c16c0eb..f2fcd54 100755 --- a/bashbot.sh +++ b/bashbot.sh @@ -11,7 +11,7 @@ # This file is public domain in the USA and all free countries. # Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying) # -#### $$VERSION$$ v0.98-dev-25-g4b18757 +#### $$VERSION$$ v0.98-dev-26-g8991cc9 # # Exit Codes: # - 0 sucess (hopefully) @@ -1055,6 +1055,9 @@ if [ "${SOURCE}" != "yes" ]; then if [ -n "${BOTPID}" ]; then # shellcheck disable=SC2086 if kill ${BOTPID}; then + # inform botadmin about stop + ADMIN="$(getConfigKey "botadmin")" + [ "${ADMIN}" -gt 4 ] && send_normal_message "${ADMIN}" "Bot $(getConfigKey "botname") stopped ..." & echo -e "${GREEN}OK. Bot stopped successfully.${NC}" else echo -e "${RED}An error occured while stopping bot.${NC}" diff --git a/modules/background.sh b/modules/background.sh index 7bb6a5e..d00c617 100644 --- a/modules/background.sh +++ b/modules/background.sh @@ -5,7 +5,7 @@ # This file is public domain in the USA and all free countries. # Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying) # -#### $$VERSION$$ v0.98-dev-17-gdda5b6d +#### $$VERSION$$ v0.98-dev-26-g8991cc9 # will be automatically sourced from bashbot @@ -119,7 +119,7 @@ inproc() { # suspendb* # resumeb* job_control() { - local content proc CHAT job fifo killall="" + local ADMIN content proc CHAT job fifo killall="" for FILE in "${DATADIR:-.}/"*-back.cmd; do [ "${FILE}" = "${DATADIR:-.}/*-back.cmd" ] && echo -e "${RED}No background processes.${NC}" && break content="$(< "${FILE}")" @@ -132,16 +132,25 @@ job_control() { "resumeb"*|"backgr"*) printf "Restart Job: %s %s\n" "${proc}" " ${fifo}" restart_back "${CHAT}" "${proc}" "${job}" + # inform botadmin about stop + ADMIN="$(getConfigKey "botadmin")" + [ "${ADMIN}" -gt 4 ] && send_normal_message "${ADMIN}" "Bot $(getConfigKey "botname") restart background jobs ..." & ;; "suspendb"*) printf "Suspend Job: %s %s\n" "${proc}" " ${fifo}" kill_proc "${CHAT}" "${job}" + # inform botadmin about stop + ADMIN="$(getConfigKey "botadmin")" + [ "${ADMIN}" -gt 4 ] && send_normal_message "${ADMIN}" "Bot $(getConfigKey "botname") suspend background jobs ..." & killall="y" ;; "killb"*) printf "Kill Job: %s %s\n" "${proc}" " ${fifo}" kill_proc "${CHAT}" "${job}" rm -f "${FILE}" # remove job + # inform botadmin about stop + ADMIN="$(getConfigKey "botadmin")" + [ "${ADMIN}" -gt 4 ] && send_normal_message "${ADMIN}" "Bot $(getConfigKey "botname") kill background jobs ..." & killall="y" ;; esac