suzanne.soy/travis-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use unicorn for now, we need to fix concurrency issues to use puma

Browse Source
This commit is contained in:
Piotr Sarnacki 2012-11-07 13:40:07 +01:00
parent 3fc6059d03
commit ba364c8188
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -3,7 +3,7 @@ ruby '1.9.3' rescue nil
source :rubygems source :rubygems
gemspec gemspec
gem 'puma' gem 'unicorn'
gem 'travis-support', github: 'travis-ci/travis-support' gem 'travis-support', github: 'travis-ci/travis-support'
gem 'travis-core', github: 'travis-ci/travis-core' gem 'travis-core', github: 'travis-ci/travis-core'
gem 'travis-sidekiqs', github: 'travis-ci/travis-sidekiqs', require: nil gem 'travis-sidekiqs', github: 'travis-ci/travis-sidekiqs', require: nil

10
Gemfile.lock
View File

@ -156,6 +156,7 @@ GEM
i18n (0.6.1) i18n (0.6.1)
journey (1.0.4) journey (1.0.4)
json (1.7.5) json (1.7.5)
kgio (2.7.4)
listen (0.5.3) listen (0.5.3)
mail (2.4.4) mail (2.4.4)
i18n (>= 0.4.0) i18n (>= 0.4.0)
@ -188,8 +189,6 @@ GEM
coderay (~> 1.0.5) coderay (~> 1.0.5)
method_source (~> 0.8) method_source (~> 0.8)
slop (~> 3.3.1) slop (~> 3.3.1)
puma (1.6.3)
rack (~> 1.2)
pusher (0.9.4) pusher (0.9.4)
multi_json (~> 1.0) multi_json (~> 1.0)
signature (~> 0.1.2) signature (~> 0.1.2)
@ -209,6 +208,7 @@ GEM
rake (>= 0.8.7) rake (>= 0.8.7)
rdoc (~> 3.4) rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0) thor (>= 0.14.6, < 2.0)
raindrops (0.10.0)
rake (0.9.2.2) rake (0.9.2.2)
rdoc (3.12) rdoc (3.12)
json (~> 1.4) json (~> 1.4)
@ -264,6 +264,10 @@ GEM
polyglot polyglot
polyglot (>= 0.3.1) polyglot (>= 0.3.1)
tzinfo (0.3.35) tzinfo (0.3.35)
unicorn (4.4.0)
kgio (~> 2.6)
rack
raindrops (~> 0.7)
uuidtools (2.1.3) uuidtools (2.1.3)
yajl-ruby (1.1.0) yajl-ruby (1.1.0)
yard (0.8.3) yard (0.8.3)
@ -281,7 +285,6 @@ DEPENDENCIES
micro_migrations! micro_migrations!
mocha (~> 0.12) mocha (~> 0.12)
pry pry
puma
rack-cache (~> 1.2) rack-cache (~> 1.2)
rack-contrib! rack-contrib!
rake (~> 0.9.2) rake (~> 0.9.2)
@ -292,4 +295,5 @@ DEPENDENCIES
travis-core! travis-core!
travis-sidekiqs! travis-sidekiqs!
travis-support! travis-support!
unicorn
yard-sinatra! yard-sinatra!

4
script/server
View File

@ -3,6 +3,6 @@ cd "$(dirname "$0")/.."
[ $PORT ] || PORT=3000 [ $PORT ] || PORT=3000
[ $RACK_ENV ] || RACK_ENV=development [ $RACK_ENV ] || RACK_ENV=development
cmd="ruby -I lib -S bundle exec ruby -I lib -S puma config.ru -p $PORT -e $RACK_ENV --threads 0:16" cmd="ruby -I lib -S bundle exec ruby -I lib -S unicorn config.ru -p $PORT -E $RACK_ENV"
[[ $RACK_ENV == "development" ]] && exec rerun "$cmd -b tcp://127.0.0.1:$PORT" [[ $RACK_ENV == "development" ]] && exec rerun "$cmd -l 127.0.0.1:$PORT"
exec $cmd exec $cmd