From a9f8db27bd6b1af834b1e516a4b4c9f37a027271 Mon Sep 17 00:00:00 2001 From: iouAkira Date: Wed, 24 Mar 2021 13:16:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E7=BA=A2joy=E6=8C=82=E6=9C=BA?= =?UTF-8?q?=E8=84=9A=E6=9C=AC=E5=85=BC=E5=AE=B9spnode=20spnode=20=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E8=B7=AF=E5=BE=84=E8=84=9A=E6=9C=AC=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=94=9F=E6=88=90=E6=8A=A5=E9=94=99=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/bot/jd_bot | 9 +++++---- docker/proc_file.sh | 9 +++++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/docker/bot/jd_bot b/docker/bot/jd_bot index d65a5514..b45d7c68 100644 --- a/docker/bot/jd_bot +++ b/docker/bot/jd_bot @@ -140,9 +140,10 @@ def spnode(update, context): msg = context.bot.sendMessage(text='```{}```'.format( helpers.escape_markdown(' ↓↓↓ %s 执行结果超长,请查看log ↓↓↓' % cmd)), chat_id=update.effective_chat.id, parse_mode=ParseMode.MARKDOWN_V2) - - log_name = '%sbot_%s_%s.log' % ( - _logs_dir, 'spnode', re.findall(r"(?<=/)\w+", cmd)[-1]) + file_name = re.split(r"\W+", cmd) + if 'js' in file_name: + file_name.remove('js') + log_name = '%sbot_%s_%s.log' % (_logs_dir, 'spnode', file_name[-1]) with open(log_name, 'a+') as wf: wf.write(out_text) @@ -718,7 +719,7 @@ def shcmd(update, context): commands = update.message.text.split() commands.remove('/cmd') if len(commands) > 0: - support_cmd = ["echo", "ls", "pwd", "cp", "mv", "ps", "wget", "cat", "sed", "git", "sed", "apk", "sh", + support_cmd = ["echo", "ls", "pwd", "cp", "mv", "ps", "wget", "cat", "sed", "git", "apk", "sh", "docker_entrypoint.sh"] if commands[0] in support_cmd: sp_cmd = ["sh", "docker_entrypoint.sh"] diff --git a/docker/proc_file.sh b/docker/proc_file.sh index 6fa9a9a3..3fb1026d 100644 --- a/docker/proc_file.sh +++ b/docker/proc_file.sh @@ -1,19 +1,24 @@ #!/bin/sh +if [[ -f /usr/bin/jd_bot && -z "$DISABLE_SPNODE" ]]; then + CMD="spnode" +else + CMD="NODE" +fi echo "处理jd_crazy_joy_coin任务。。。" if [ ! $CRZAY_JOY_COIN_ENABLE ]; then echo "默认启用jd_crazy_joy_coin杀掉jd_crazy_joy_coin任务,并重启" eval $(ps -ef | grep "jd_crazy" | grep -v "grep" | awk '{print "kill "$1}') echo '' >/scripts/logs/jd_crazy_joy_coin.log - node /scripts/jd_crazy_joy_coin.js | ts >>/scripts/logs/jd_crazy_joy_coin.log 2>&1 & + $CMD /scripts/jd_crazy_joy_coin.js | ts >>/scripts/logs/jd_crazy_joy_coin.log 2>&1 & echo "默认jd_crazy_joy_coin重启完成" else if [ $CRZAY_JOY_COIN_ENABLE = "Y" ]; then echo "配置启用jd_crazy_joy_coin,杀掉jd_crazy_joy_coin任务,并重启" eval $(ps -ef | grep "jd_crazy" | grep -v "grep" | awk '{print "kill "$1}') echo '' >/scripts/logs/jd_crazy_joy_coin.log - node /scripts/jd_crazy_joy_coin.js | ts >>/scripts/logs/jd_crazy_joy_coin.log 2>&1 & + $CMD /scripts/jd_crazy_joy_coin.js | ts >>/scripts/logs/jd_crazy_joy_coin.log 2>&1 & echo "配置jd_crazy_joy_coin重启完成" else eval $(ps -ef | grep "jd_crazy" | grep -v "grep" | awk '{print "kill "$1}')