nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

check for redis only if not in single process mode

Browse source
This commit is contained in:
danielgrippi 2011-05-17 10:15:08 -07:00
parent 5218bd89c6
commit 1bdfd770b7
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
script/server
View file

@ -122,9 +122,6 @@ if [ -n "$services" ]; then
exit 64 exit 64
fi fi
redis_config
# Force AGPL # Force AGPL
if [ -w public -a ! -e public/source.tar.gz ]; then if [ -w public -a ! -e public/source.tar.gz ]; then
branch=$( git branch | awk '/^[*]/ {print $2}') branch=$( git branch | awk '/^[*]/ {print $2}')
@ -170,7 +167,9 @@ fi
mkdir -p -v log/thin/ mkdir -p -v log/thin/
if [ "$(./script/get_config.rb single_process_mode $RAILS_ENV)" = "false" ]; then if [ "$(./script/get_config.rb single_process_mode $RAILS_ENV)" = "false" ]; then
redis_config
redis-server config/redis.conf &>log/redis-console.log & redis-server config/redis.conf &>log/redis-console.log &
QUEUE=* bundle exec rake resque:work& QUEUE=* bundle exec rake resque:work&
bundle exec ruby ./script/websocket_server.rb& bundle exec ruby ./script/websocket_server.rb&