open-source/qinglong
1
0
Fork 0
mirror of https://github.com/whyour/qinglong.git synced 2025-07-28 23:46:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge 6a691444af into a7e404c5d5

Browse Source
This commit is contained in:
Chiupam 2022-02-20 23:50:44 +08:00 committed by GitHub
commit 23e9761561
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/docker-entrypoint.sh
View File

@ -32,7 +32,7 @@ echo -e "定时任务启动成功...\n"
if [[ $AutoStartBot == true ]]; then if [[ $AutoStartBot == true ]]; then
echo -e "======================6. 启动bot========================\n" echo -e "======================6. 启动bot========================\n"
nohup ql bot >>$dir_log/start.log 2>&1 & pm2 start $dir_root/jbot/ecosystem.config.js
echo -e "bot后台启动中...\n" echo -e "bot后台启动中...\n"
fi fi

13
shell/bot.sh
View File

@ -46,7 +46,14 @@ echo -e "\npython3依赖安装成功...\n"
echo -e "4、启动bot程序...\n" echo -e "4、启动bot程序...\n"
make_dir $dir_log/bot make_dir $dir_log/bot
cd $dir_root if [[ -z ${BotRepoUrl} ]]; then
ps -ef | grep "python3 -m jbot" | grep -v grep | awk '{print $1}' | xargs kill -9 2>/dev/null cd $dir_root
nohup python3 -m jbot >$dir_log/bot/nohup.log 2>&1 & ps -ef | grep "python3 -m jbot" | grep -v grep | awk '{print $1}' | xargs kill -9 2>/dev/null
nohup python3 -m jbot >$dir_log/bot/nohup.log 2>&1 &
else
cd $dir_root/jbot
pm2 start ecosystem.config.js
cd $dir_root
pm2 restart jbot
fi
echo -e "bot启动成功...\n" echo -e "bot启动成功...\n"