Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop thin support #1627

Merged
merged 7 commits into from
Aug 8, 2020
Merged

Drop thin support #1627

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b989bda
Use puma instead of thin in examples.
rkmathi Jul 26, 2020
559f01a
Remove thin? and add rainbows? in integration_test.
rkmathi Jul 26, 2020
7cec4e9
Remove thin in settings_test.
rkmathi Jul 26, 2020
6073462
Remove thin in lib.
rkmathi Jul 26, 2020
c0d4dd7
Use puma or rainbows instead of thin in readme.
rkmathi Jul 26, 2020
965c8b9
Create integration_async_test for to be enable test with rainbows
rkmathi Aug 4, 2020
7a96472
Run examples/stream.ru with rainbows.
rkmathi Aug 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove thin in lib.
  • Loading branch information
@rkmathi
rkmathi committed Jul 28, 2020
commit 607346295924c75a86f12ecbad9430cfc430c032
10 changes: 4 additions & 6 deletions lib/sinatra/base.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ def drop_body?
end
end

# Some Rack handlers (Thin, Rainbows!) implement an extended body object protocol, however,
# Some Rack handlers (Rainbows!) implement an extended body object protocol, however,
# some middleware (namely Rack::Lint) will break it by not mirroring the methods in question.
# This middleware will detect an extended body object and will make sure it reaches the
# handler directly. We do this here, so our middleware and middleware set up by the app will
Expand Down Expand Up @@ -473,7 +473,7 @@ def closed?
#
# The close parameter specifies whether Stream#close should be called
# after the block has been executed. This is only relevant for evented
# servers like Thin or Rainbows.
# servers like Rainbows.
def stream(keep_open = false)
scheduler = env['async.callback'] ? EventMachine : Stream
current = @params.dup
Expand Down Expand Up @@ -1475,8 +1475,7 @@ def use(middleware, *args, &block)
# Stop the self-hosted server if running.
def quit!
return unless running?
# Use Thin's hard #stop! if available, otherwise just #stop.
running_server.respond_to?(:stop!) ? running_server.stop! : running_server.stop
running_server.stop
$stderr.puts "== Sinatra has ended his set (crowd applauds)" unless suppress_messages?
set :running_server, nil
set :handler_name, nil
Expand All @@ -1485,7 +1484,7 @@ def quit!
alias_method :stop!, :quit!

# Run the Sinatra app as a self-hosted server using
# Thin, Puma, Mongrel, or WEBrick (in that order). If given a block, will call
# Puma, Mongrel, or WEBrick (in that order). If given a block, will call
# with the constructed handler once we have taken the stage.
def run!(options = {}, &block)
return if running?
Expand Down Expand Up @@ -1849,7 +1848,6 @@ class << self
server.unshift 'reel'
server.unshift 'puma'
server.unshift 'mongrel' if ruby_engine.nil?
server.unshift 'thin' if ruby_engine != 'jruby'
server.unshift 'trinidad' if ruby_engine == 'jruby'
namusyaka marked this conversation as resolved.
Show resolved Hide resolved
end

Expand Down
2 changes: 1 addition & 1 deletion lib/sinatra/main.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ module Sinatra
require 'optparse'
parser = OptionParser.new { |op|
op.on('-p port', 'set the port (default is 4567)') { |val| ParamsConfig[:port] = Integer(val) }
op.on('-s server', 'specify rack server/handler (default is thin)') { |val| ParamsConfig[:server] = val }
op.on('-s server', 'specify rack server/handler (default is puma)') { |val| ParamsConfig[:server] = val }
op.on('-q', 'turn on quiet mode (default is off)') { ParamsConfig[:quiet] = true }
op.on('-x', 'turn on the mutex lock (default is off)') { ParamsConfig[:lock] = true }
op.on('-e env', 'set the environment (default is development)') do |val|
Expand Down