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

Revert "switch to unicorn"

Browse Source 
The switch was done in order to see if puma may be related to 503
issues, but since it didn't change a thing, we may bring it back

This reverts commit 74612ed067.
This commit is contained in:
Piotr Sarnacki 2013-04-16 20:03:47 +02:00
parent a1de5fb6c5
commit 95b240e211
3 changed files with 11 additions and 15 deletions

2
Gemfile
View File

@ -12,7 +12,7 @@ gem 'sinatra-contrib', require: nil #github: 'sinatra/sinatra-contrib', require:
# TODO need to release the gem as soon i'm certain this change makes sense
gem 'simple_states', github: 'svenfuchs/simple_states', branch: 'sf-set-state-early'
gem 'unicorn'
gem 'puma'
gem "sentry-raven", github: 'getsentry/raven-ruby'
gem 'yard-sinatra', github: 'rkh/yard-sinatra'
gem 'rack-contrib', github: 'rack/rack-contrib'

20
Gemfile.lock
View File

@ -17,11 +17,11 @@ GIT
GIT
remote: git://github.com/rkh/gh.git
revision: e8d34e81640260441a2103f9d5395b2dbbe60258
revision: 5e781e424e346838604563bd6408c4419f5480b0
specs:
gh (0.9.2)
gh (0.9.1)
addressable
backports
backports (~> 2.3)
faraday (~> 0.8)
multi_json (~> 1.0)
net-http-persistent (>= 2.7)
@ -45,7 +45,7 @@ GIT
GIT
remote: git://github.com/travis-ci/travis-core.git
revision: 5fe14c24a41e249e53a365e0894c56ce74ed861c
revision: c5ceac066aeea4a5b3d84e66a165b8c188f13c9f
specs:
travis-core (0.0.1)
actionmailer (~> 3.2.12)
@ -128,7 +128,7 @@ GEM
activesupport (3.2.13)
i18n (= 0.6.1)
multi_json (~> 1.0)
addressable (2.3.4)
addressable (2.3.3)
arel (3.0.2)
atomic (1.1.7)
avl_tree (1.1.3)
@ -166,7 +166,6 @@ GEM
i18n (0.6.1)
journey (1.0.4)
json (1.7.7)
kgio (2.8.0)
listen (0.7.2)
mail (2.5.3)
i18n (>= 0.4.0)
@ -192,6 +191,8 @@ GEM
coderay (~> 1.0.5)
method_source (~> 0.8)
slop (~> 3.4)
puma (1.6.3)
rack (~> 1.2)
pusher (0.11.3)
multi_json (~> 1.0)
signature (~> 0.1.6)
@ -211,7 +212,6 @@ GEM
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
raindrops (0.10.0)
rake (0.9.6)
rb-fsevent (0.9.3)
rdoc (3.12.2)
@ -266,10 +266,6 @@ GEM
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.37)
unicorn (4.6.2)
kgio (~> 2.6)
rack
raindrops (~> 0.7)
uuidtools (2.1.3)
yajl-ruby (1.1.0)
yard (0.8.4.1)
@ -288,6 +284,7 @@ DEPENDENCIES
micro_migrations!
mocha (~> 0.12)
pry
puma
rack-cache (~> 1.2)
rack-contrib!
rake (~> 0.9.2)
@ -302,5 +299,4 @@ DEPENDENCIES
travis-core!
travis-sidekiqs!
travis-support!
unicorn
yard-sinatra!

4
script/server
View File

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