sinvo/jd_scripts
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

分红joy挂机脚本兼容spnode

Browse Source 
spnode 执行路径脚本日志文件生成报错修复
This commit is contained in:
iouAkira
2021-03-24 13:16:49 +08:00
parent ec19ab890f
commit a9f8db27bd
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
docker/bot/jd_bot
View File

@@ -140,9 +140,10 @@ def spnode(update, context):
msg = context.bot.sendMessage(text='```{}```'.format( msg = context.bot.sendMessage(text='```{}```'.format(
helpers.escape_markdown(' ↓↓↓ %s 执行结果超长,请查看log ↓↓↓' % cmd)), chat_id=update.effective_chat.id, helpers.escape_markdown(' ↓↓↓ %s 执行结果超长,请查看log ↓↓↓' % cmd)), chat_id=update.effective_chat.id,
parse_mode=ParseMode.MARKDOWN_V2) parse_mode=ParseMode.MARKDOWN_V2)
file_name = re.split(r"\W+", cmd)
log_name = '%sbot_%s_%s.log' % ( if 'js' in file_name:
_logs_dir, 'spnode', re.findall(r"(?<=/)\w+", cmd)[-1]) file_name.remove('js')
log_name = '%sbot_%s_%s.log' % (_logs_dir, 'spnode', file_name[-1])
with open(log_name, 'a+') as wf: with open(log_name, 'a+') as wf:
wf.write(out_text) wf.write(out_text)
@@ -718,7 +719,7 @@ def shcmd(update, context):
commands = update.message.text.split() commands = update.message.text.split()
commands.remove('/cmd') commands.remove('/cmd')
if len(commands) > 0: 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"] "docker_entrypoint.sh"]
if commands[0] in support_cmd: if commands[0] in support_cmd:
sp_cmd = ["sh", "docker_entrypoint.sh"] sp_cmd = ["sh", "docker_entrypoint.sh"]

9
docker/proc_file.sh
View File

@@ -1,19 +1,24 @@
#!/bin/sh #!/bin/sh
if [[ -f /usr/bin/jd_bot && -z "$DISABLE_SPNODE" ]]; then
CMD="spnode"
else
CMD="NODE"
fi
echo "处理jd_crazy_joy_coin任务。。。" echo "处理jd_crazy_joy_coin任务。。。"
if [ ! $CRZAY_JOY_COIN_ENABLE ]; then if [ ! $CRZAY_JOY_COIN_ENABLE ]; then
echo "默认启用jd_crazy_joy_coin杀掉jd_crazy_joy_coin任务，并重启" echo "默认启用jd_crazy_joy_coin杀掉jd_crazy_joy_coin任务，并重启"
eval $(ps -ef | grep "jd_crazy" | grep -v "grep" | awk '{print "kill "$1}') eval $(ps -ef | grep "jd_crazy" | grep -v "grep" | awk '{print "kill "$1}')
echo '' >/scripts/logs/jd_crazy_joy_coin.log 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重启完成" echo "默认jd_crazy_joy_coin重启完成"
else else
if [ $CRZAY_JOY_COIN_ENABLE = "Y" ]; then if [ $CRZAY_JOY_COIN_ENABLE = "Y" ]; then
echo "配置启用jd_crazy_joy_coin，杀掉jd_crazy_joy_coin任务，并重启" echo "配置启用jd_crazy_joy_coin，杀掉jd_crazy_joy_coin任务，并重启"
eval $(ps -ef | grep "jd_crazy" | grep -v "grep" | awk '{print "kill "$1}') eval $(ps -ef | grep "jd_crazy" | grep -v "grep" | awk '{print "kill "$1}')
echo '' >/scripts/logs/jd_crazy_joy_coin.log 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重启完成" echo "配置jd_crazy_joy_coin重启完成"
else else
eval $(ps -ef | grep "jd_crazy" | grep -v "grep" | awk '{print "kill "$1}') eval $(ps -ef | grep "jd_crazy" | grep -v "grep" | awk '{print "kill "$1}')