mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
8c5c5a221f
will now continue only when a StandardError subclass is raised. For other exception types the error will be logged at the fatal level and the server will safely stop. Based on a patch by Alex Young. [ruby-trunk - Feature #6236] * test/webrick/test_server.rb: Test for new exception handling behavior. Join the server thread instead of busy-waiting for it to shut down to remove race conditions. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35303 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
57 lines
1.5 KiB
Ruby
57 lines
1.5 KiB
Ruby
require_relative '../ruby/envutil'
|
|
require "webrick"
|
|
begin
|
|
require "webrick/https"
|
|
rescue LoadError
|
|
end
|
|
require "webrick/httpproxy"
|
|
|
|
module TestWEBrick
|
|
NullWriter = Object.new
|
|
def NullWriter.<<(msg)
|
|
puts msg if $DEBUG
|
|
return self
|
|
end
|
|
|
|
RubyBin = "\"#{EnvUtil.rubybin}\""
|
|
RubyBin << " --disable-gems"
|
|
RubyBin << " \"-I#{File.expand_path("../..", File.dirname(__FILE__))}/lib\""
|
|
RubyBin << " \"-I#{File.dirname(EnvUtil.rubybin)}/.ext/common\""
|
|
RubyBin << " \"-I#{File.dirname(EnvUtil.rubybin)}/.ext/#{RUBY_PLATFORM}\""
|
|
|
|
module_function
|
|
|
|
def start_server(klass, config={}, &block)
|
|
log_string = ""
|
|
logger = Object.new
|
|
logger.instance_eval do
|
|
define_singleton_method(:<<) {|msg| log_string << msg }
|
|
end
|
|
log = proc { "webrick log start:\n" + log_string.gsub(/^/, " ").chomp + "\nwebrick log end" }
|
|
server = klass.new({
|
|
:BindAddress => "127.0.0.1", :Port => 0,
|
|
:ShutdownSocketWithoutClose =>true,
|
|
:ServerType => Thread,
|
|
:Logger => WEBrick::Log.new(logger),
|
|
:AccessLog => [[logger, ""]]
|
|
}.update(config))
|
|
begin
|
|
server_thread = server.start
|
|
addr = server.listeners[0].addr
|
|
block.yield([server, addr[3], addr[1], log])
|
|
ensure
|
|
server.shutdown
|
|
|
|
server_thread.join
|
|
end
|
|
log_string
|
|
end
|
|
|
|
def start_httpserver(config={}, &block)
|
|
start_server(WEBrick::HTTPServer, config, &block)
|
|
end
|
|
|
|
def start_httpproxy(config={}, &block)
|
|
start_server(WEBrick::HTTPProxyServer, config, &block)
|
|
end
|
|
end
|