diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh index e852e637..6d545fee 100755 --- a/docker/docker-entrypoint.sh +++ b/docker/docker-entrypoint.sh @@ -32,7 +32,7 @@ echo -e "定时任务启动成功...\n" if [[ $AutoStartBot == true ]]; then 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" fi diff --git a/shell/bot.sh b/shell/bot.sh index d2dbe2a9..44af8834 100644 --- a/shell/bot.sh +++ b/shell/bot.sh @@ -46,7 +46,14 @@ echo -e "\npython3依赖安装成功...\n" echo -e "4、启动bot程序...\n" make_dir $dir_log/bot -cd $dir_root -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 & +if [[ -z ${BotRepoUrl} ]]; then + cd $dir_root + 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"