diff --git a/script/server b/script/server index b65e087c910d553db1bd85cfc14cf5a8c8d66652..714cb81774c85c525a241ab98c347ed938fd9e90 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&