diff options
| author | danielgrippi <danielgrippi@gmail.com> | 2011-05-17 21:15:08 +0400 |
|---|---|---|
| committer | danielgrippi <danielgrippi@gmail.com> | 2011-05-17 21:34:40 +0400 |
| commit | 1bdfd770b7f3b964f5b5aa665410c16d4f738e04 (patch) | |
| tree | a70d5969d4f2ad876999633a5f62a7e3e913977e /script | |
| parent | 5218bd89c61a5a3effe05481795511051b8accc6 (diff) | |
check for redis only if not in single process mode
Diffstat (limited to 'script')
| -rwxr-xr-x | script/server | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/script/server b/script/server index b65e087c9..714cb8177 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& |