From e2154d3946a461fc6c0258127cb461ce01a86bdd Mon Sep 17 00:00:00 2001 From: chiu Date: Mon, 23 Aug 2021 18:24:43 +0800 Subject: [PATCH] fix error --- app/controllers/admin/ruling_buses_controller.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/controllers/admin/ruling_buses_controller.rb b/app/controllers/admin/ruling_buses_controller.rb index e647b1d..ca37f2c 100644 --- a/app/controllers/admin/ruling_buses_controller.rb +++ b/app/controllers/admin/ruling_buses_controller.rb @@ -22,10 +22,8 @@ class Admin::RulingBusesController < OrbitAdminController @ruling_bus_setting = RulingBusSetting.find(params[:id]) @ruling_bus_setting.update_attributes(ruling_bus_setting_params) Thread.new do - sleep 3 - mode = Rails.env - content = "UNICORN_PID=\"`fuser tmp/pids/unicorn.sock tmp/sockets/unicorn.sock tmp/unicorn.sock` `cat tmp/pids/unicorn.pid `\" && kill -s TERM $UNICORN_PID ; while (kill -0 $UNICORN_PID > /dev/null 2>&1) ; do printf '.' && sleep 1 ; done ; unset UNICORN_FD; bundle exec unicorn_rails -c config/unicorn.rb -D -E #{mode}" - system(content) + content = "UNICORN_PID=\"`fuser tmp/pids/unicorn.sock tmp/sockets/unicorn.sock tmp/unicorn.sock` `cat tmp/pids/unicorn.pid `\" && kill -s USR2 $UNICORN_PID ; n=20; while (kill -0 $UNICORN_PID > /dev/null 2>&1) && test $n -ge 0; do printf '.' && sleep 1 && n=$(( $n - 1 )); done ; if test $n -lt 0; then kill -s TERM $UNICORN_PID; sleep 3; bundle exec unicorn_rails -c config/unicorn.rb -D -E #{Rails.env}; else kill -s QUIT $UNICORN_PID; fi" + system(content) end redirect_to (params[:referer_url].blank? ? "/#{I18n.locale}/admin/ruling_buses": params[:referer_url]) end