Просмотр исходного кода

Added support of new scheduler.

Martin Edenhofer 11 лет назад
Родитель
Сommit
f03864c62e
1 измененных файлов с 3 добавлено и 8 удалено
  1. 3 8
      script/init-script-normal-user-rvm-fedora

+ 3 - 8
script/init-script-normal-user-rvm-fedora

@@ -63,7 +63,7 @@ start() {
     echo -n $"Starting ${NAME}/${RAILS_ENV} application server on port: ${APP_PORT}"
 #    $RAILS server -d -p $APP_PORT --pid $APP_PIDFILE &> /dev/null
 #    thin start --threaded -d -p $APP_PORT --pid $APP_PIDFILE
-    pumactl start --pidfile $APP_PIDFILE -d -p $APP_PORT -e $RAILS_ENV
+    pumactl start --pidfile $APP_PIDFILE -d -p $APP_PORT -e $RAILS_ENV &> /dev/null
     sleep 2
     status -p $APP_PIDFILE &> /dev/null && echo_success || echo_failure
     echo
@@ -77,18 +77,14 @@ start() {
 
     # start scheduler worker
     echo -n $"Starting ${NAME}/${RAILS_ENV} scheduler worker"
-    script/scheduler.rb start
-    sleep 10
-    status -p $SCHEDULER_PIDFILE &> /dev/null && echo_success || echo_failure
+    script/scheduler.rb start &> /dev/null && echo_success || echo_failure
     echo
 }
 
 stop() {
     # stop scheduler worker
     echo -n $"Shutting down ${NAME}/${RAILS_ENV} scheduler worker"
-    if test -e $SCHEDULER_PIDFILE; then
-        killproc -p $SCHEDULER_PIDFILE
-    fi
+    script/scheduler.rb stop &> /dev/null && echo_success || echo_failure
     echo
 
     # stop websocket server
@@ -121,7 +117,6 @@ case "$1" in
     status)
         status -p $APP_PIDFILE "${NAME} ${RAILS_ENV} - application server"
         status -p $WS_PIDFILE "${NAME} ${RAILS_ENV} - web socket server"
-        status -p $SCHEDULER_PIDFILE "${NAME} ${RAILS_ENV} - scheduler worker"
     ;;
 
     *)