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

correct fix for #1547 #1554

Merged
merged 1 commit into from
Aug 19, 2019
Merged

correct fix for #1547 #1554

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
correct fix for #1547
  • Loading branch information
@namusyaka
namusyaka committed Aug 19, 2019
commit 6504f2c87ffa6701fbba0600acdc1986a6647909
36 changes: 23 additions & 13 deletions lib/sinatra/main.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,25 @@
require 'sinatra/base'

module Sinatra
ParamsConfig = {}

if ARGV.any?
require 'optparse'
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('-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|
ENV['RACK_ENV'] = val
ParamsConfig[:environment] = val.to_sym
end
op.on('-o addr', "set the host (default is (env == 'development' ? 'localhost' : '0.0.0.0'))") do |val|
ParamsConfig[:bind] = val
end
}.parse!(ARGV.dup)
end

require 'sinatra/base'

class Application < Base

# we assume that the first file that requires 'sinatra' is the
Expand All @@ -10,19 +29,10 @@ class Application < Base

set :run, Proc.new { File.expand_path($0) == File.expand_path(app_file) }

if run? && ARGV.any?
require 'optparse'
OptionParser.new { |op|
op.on('-p port', 'set the port (default is 4567)') { |val| set :port, Integer(val) }
op.on('-o addr', "set the host (default is #{bind})") { |val| set :bind, val }
op.on('-e env', 'set the environment (default is development)') { |val| set :environment, val.to_sym }
op.on('-s server', 'specify rack server/handler (default is thin)') { |val| set :server, val }
op.on('-q', 'turn on quiet mode (default is off)') { set :quiet, true }
op.on('-x', 'turn on the mutex lock (default is off)') { set :lock, true }
}.parse!(ARGV.dup)
end
ParamsConfig.each { |k, v| set k, v } if run? && ARGV.any?
end

remove_const(:ParamsConfig)
at_exit { Application.run! if $!.nil? && Application.run? }
end

Expand Down