From f03864c62eb8249950e3d2fe59e6e79f8fb22041 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Tue, 11 Mar 2014 11:29:36 +0100 Subject: [PATCH] Added support of new scheduler. --- script/init-script-normal-user-rvm-fedora | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/script/init-script-normal-user-rvm-fedora b/script/init-script-normal-user-rvm-fedora index 037e5d5d6..3358e06d2 100755 --- a/script/init-script-normal-user-rvm-fedora +++ b/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" ;; *)