no need to run the websocket server if redis isn't running (in single_process_mode)

1 files changed, 2 insertions, 1 deletions

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