diff options
| author | Seth Vargo <sethvargo@gmail.com> | 2013-12-15 18:24:21 -0500 |
|---|---|---|
| committer | Seth Vargo <sethvargo@gmail.com> | 2013-12-17 12:17:04 -0500 |
| commit | 0aaabe6b325fee332422bd03c94eab3eacefbc60 (patch) | |
| tree | 0bdb656722c1b92bb89d38732372d7a3cc7d74a2 /.travis.yml | |
| parent | 0d5e08883fa9608c328cf57c12a77b492ddf8500 (diff) | |
| download | chef-zero-0aaabe6b325fee332422bd03c94eab3eacefbc60.tar.gz | |
Remove puma and clean up threading
This commit removes all instances of the Puma webserver, since it has known
issues on a number of supported platforms and adds significant branching
logic to the code.
This commit also re-defines what it means when the server is "running". In
the past, "running" has meant the web server is up. Testing has revealed that
web servers actually lie and say they are running, even if they are not
accepting requests. The new `running?` method uses OpenURI to access a known
URL on the server.
WEBrick does not support running on a socket, so the `--socket` option has
also been removed.
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 1c8e391..381daff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,22 +10,20 @@ matrix: gemfile: Gemfile - rvm: 1.8.7 env: SKIP_PEDANT=true - gemfile: gemfiles/gemfile.no-pedant + gemfile: gemfiles/no-pedant.gemfile - rvm: 1.9.3 - gemfile: gemfiles/gemfile.latest-pedant + gemfile: gemfiles/latest-pedant.gemfile - rvm: jruby-19mode gemfile: Gemfile - rvm: jruby-19mode env: SKIP_PEDANT=true - gemfile: gemfiles/gemfile.no-pedant + gemfile: gemfiles/no-pedant.gemfile - rvm: 2.0.0 gemfile: Gemfile - - rvm: 2.0.0 - gemfile: gemfiles/gemfile.puma allow_failures: - rvm: 1.8.7 gemfile: Gemfile - rvm: jruby-19mode gemfile: Gemfile - rvm: 1.9.3 - gemfile: gemfiles/gemfile.latest-pedant + gemfile: gemfiles/latest-pedant.gemfile |