From 1bdfd770b7f3b964f5b5aa665410c16d4f738e04 Mon Sep 17 00:00:00 2001 From: danielgrippi <danielgrippi@gmail.com> Date: Tue, 17 May 2011 10:15:08 -0700 Subject: [PATCH] check for redis only if not in single process mode --- script/server | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/script/server b/script/server index b65e087c91..714cb81774 100755 --- a/script/server +++ b/script/server @@ -122,9 +122,6 @@ if [ -n "$services" ]; then exit 64 fi -redis_config - - # Force AGPL if [ -w public -a ! -e public/source.tar.gz ]; then branch=$( git branch | awk '/^[*]/ {print $2}') @@ -170,7 +167,9 @@ fi mkdir -p -v log/thin/ if [ "$(./script/get_config.rb single_process_mode $RAILS_ENV)" = "false" ]; then + redis_config redis-server config/redis.conf &>log/redis-console.log & + QUEUE=* bundle exec rake resque:work& bundle exec ruby ./script/websocket_server.rb& -- GitLab