octoleo
/
telegram-bot-bash
mirror of https://github.com/octoleo/telegram-bot-bash.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

restart == resume

This commit is contained in:
Kay Marquardt (Gnadelwartz) 2021-02-25 19:58:00 +01:00
parent f4d45d814f
commit 2131911625
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bashbot.sh
View File

@ -30,7 +30,7 @@ BOTCOMMANDS="-h help init start stop status suspendback resumeback killb
# 8 - curl/wget missing # 8 - curl/wget missing
# 10 - not bash! # 10 - not bash!
# #
#### $$VERSION$$ v1.45-dev-44-g17efeeb #### $$VERSION$$ v1.45-dev-48-gf4d45d8
################################################################## ##################################################################
# are we running in a terminal? # are we running in a terminal?
@ -912,7 +912,7 @@ if [ -z "${SOURCE}" ]; then
exit exit
;; ;;
# suspend, resume or kill background jobs # suspend, resume or kill background jobs
"suspendb"*|"resumeb"*|"killb"*) "suspendb"*|"resumeb"*|'restartb'*|"killb"*)
_is_function job_control || { printf "${RED}Module background is not available!${NN}"; exit 3; } _is_function job_control || { printf "${RED}Module background is not available!${NN}"; exit 3; }
ME="$(getConfigKey "botname")" ME="$(getConfigKey "botname")"
job_control "$1" job_control "$1"

4
examples/webhook/README.md
View File

@ -50,7 +50,7 @@ Webhook works without running Bashbot and thus has the following limitations:
To run startup actions and `TIMER_EVENTS` run Bashbot with `./bashbot start` even not needed with webhook. To run startup actions and `TIMER_EVENTS` run Bashbot with `./bashbot start` even not needed with webhook.
Workaround for running new background jobs is to execute `./bashbot.sh restartback` on the command line after starting a new background job. Workaround for running new background jobs is to execute `./bashbot.sh resumeback` on the command line after starting a new background job.
#### Enable webhook on Telegram side #### Enable webhook on Telegram side
@ -88,5 +88,5 @@ and read updates from the named pipe `data-bot-bash/webhook-fifo-<botname>`, sim
But the default webhook method is so convincing and responsive that a special high traffic mode is not necessary. But the default webhook method is so convincing and responsive that a special high traffic mode is not necessary.
#### $$VERSION$$ v1.45-dev-47-gf4323e4 #### $$VERSION$$ v1.45-dev-48-gf4d45d8

13
modules/background.sh
View File

@ -6,7 +6,7 @@
# Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying) # Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying)
# #
# shellcheck disable=SC1117,SC2059 # shellcheck disable=SC1117,SC2059
#### $$VERSION$$ v1.45-dev-46-gc57e927 #### $$VERSION$$ v1.45-dev-48-gf4d45d8
# will be automatically sourced from bashbot # will be automatically sourced from bashbot
@ -125,10 +125,7 @@ inproc() {
} }
# start stop all jobs # start stop all jobs
# $1 command # $1 command # kill suspend resume restart
# killb*
# suspendb*
# resumeb*
job_control() { job_control() {
local BOT ADM content proc CHAT job fifo killall="" local BOT ADM content proc CHAT job fifo killall=""
BOT="$(getConfigKey "botname")" BOT="$(getConfigKey "botname")"
@ -144,20 +141,20 @@ job_control() {
fifo="$(procname "${CHAT}" "${job}")" fifo="$(procname "${CHAT}" "${job}")"
debug_checks "Execute job_control" "$1" "${FILE##*/}" debug_checks "Execute job_control" "$1" "${FILE##*/}"
case "$1" in case "$1" in
"resumeb"*|"backgr"*) "resume"*|"restart"*)
printf "Restart Job: %s %s\n" "${proc}" " ${fifo##*/}" printf "Restart Job: %s %s\n" "${proc}" " ${fifo##*/}"
restart_back "${CHAT}" "${proc}" "${job}" restart_back "${CHAT}" "${proc}" "${job}"
# inform botadmin about stop # inform botadmin about stop
[ -n "${ADM}" ] && send_normal_message "${ADM}" "Bot ${BOT} restart background jobs ..." & [ -n "${ADM}" ] && send_normal_message "${ADM}" "Bot ${BOT} restart background jobs ..." &
;; ;;
"suspendb"*) "suspend"*)
printf "Suspend Job: %s %s\n" "${proc}" " ${fifo##*/}" printf "Suspend Job: %s %s\n" "${proc}" " ${fifo##*/}"
kill_proc "${CHAT}" "${job}" kill_proc "${CHAT}" "${job}"
# inform botadmin about stop # inform botadmin about stop
[ -n "${ADM}" ] && send_normal_message "${ADM}" "Bot ${BOT} suspend background jobs ..." & [ -n "${ADM}" ] && send_normal_message "${ADM}" "Bot ${BOT} suspend background jobs ..." &
killall="y" killall="y"
;; ;;
"killb"*) "kill"*)
printf "Kill Job: %s %s\n" "${proc}" " ${fifo##*/}" printf "Kill Job: %s %s\n" "${proc}" " ${fifo##*/}"
kill_proc "${CHAT}" "${job}" kill_proc "${CHAT}" "${job}"
rm -f "${FILE}" # remove job rm -f "${FILE}" # remove job