From 934a91e47edf5c0d8c43a4e57b2694ac115adb57 Mon Sep 17 00:00:00 2001 From: danielgrippi Date: Tue, 17 May 2011 10:10:20 -0700 Subject: [PATCH] no need to run the websocket server if redis isn't running (in single_process_mode) --- script/server | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/script/server b/script/server index 8b6270b75..b65e087c9 100755 --- a/script/server +++ b/script/server @@ -169,9 +169,10 @@ if [ ! -e 'public/assets/default.css' ]; then fi mkdir -p -v log/thin/ -bundle exec ruby ./script/websocket_server.rb& if [ "$(./script/get_config.rb single_process_mode $RAILS_ENV)" = "false" ]; then redis-server config/redis.conf &>log/redis-console.log & QUEUE=* bundle exec rake resque:work& + + bundle exec ruby ./script/websocket_server.rb& fi bundle exec thin start $args