@@ -1,4 +1,5 @@ == 0.8.0 Dodgy Dentist release + * Allow disabling signal handling in Server with :signals => false * Make Server.new arguments more flexible, can now specify any of host, port, app or hash options. * Add --backend option to specified which backend to use, closes #55 * Serve static file only on GET and HEAD requests in Rails adapter, fixes #58 CHANGELOG @@ -14,14 +14,13 @@ module Thin # as the first argument. Eg.: /tmp/thin.sock. If the first argument contains a <tt>/</tt> # it will be assumed to be a UNIX socket. # - # Thin::Server.start('/tmp/thin.sock', nil, app) + # Thin::Server.start('/tmp/thin.sock', app) # # == Using a custom backend # You can implement your own way to connect the server to its client by creating your - # own Backend class and pass it as the first argument. + # own Backend class and pass it as the :backend option. # - # backend = Thin::Backends::MyFancyBackend.new('galaxy://faraway:1345') - # Thin::Server.start(backend, nil, app) + # Thin::Server.start('galaxy://faraway', 1345, app, :backend => Thin::Backends::MyFancyBackend) # # == Rack application (+app+) # All requests will be processed through +app+ that must be a valid Rack adapter. @@ -44,7 +43,8 @@ module Thin # == Controlling with signals # * QUIT: Gracefull shutdown (see Server#stop) # * INT and TERM: Force shutdown (see Server#stop!) - # + # Disable signals by passing <tt>:signals => false</tt> + # class Server include Logging include Daemonizable @@ -115,6 +115,8 @@ module Thin # If in debug mode, wrap in logger adapter @app = Rack::CommonLogger.new(@app) if Logging.debug? + + setup_signals unless options[:signals].class == FalseClass end # Lil' shortcut to turn this: @@ -130,14 +132,9 @@ module Thin end # Start the server and listen for connections. - # Also register signals: - # * INT calls +stop+ to shutdown gracefully. - # * TERM calls <tt>stop!</tt> to force shutdown. def start raise ArgumentError, 'app required' unless @app - setup_signals - log ">> Thin web server (v#{VERSION::STRING} codename #{VERSION::CODENAME})" debug ">> Debugging ON" trace ">> Tracing ON" @@ -198,7 +195,10 @@ module Thin @backend.running? end - protected + protected + # Register signals: + # * INT calls +stop+ to shutdown gracefully. + # * TERM calls <tt>stop!</tt> to force shutdown. def setup_signals trap('QUIT') { stop } unless Thin.win? trap('INT') { stop! } lib/thin/server.rb @@ -79,5 +79,10 @@ describe Server, "initialization" do server.host.should_not be_nil server.app.should == app server.backend.should be_kind_of(Thin::Backends::SwiftiplyClient) - end + end + + it "should not register signals w/ :signals => false" do + Server.should_not_receive(:setup_signals) + Server.new(:signals => false) + end end \ No newline at end of file spec/server_spec.rb 01dece1c2b32d9b12d1d2ee64aa78917f2ddaae1 macournoyer macournoyer@gmail.com http://github.com/macournoyer/thin/commit/6cb32ec3f90457e96cdc541a387bf50e07a6ecad 6cb32ec3f90457e96cdc541a387bf50e07a6ecad 2008-04-03T21:03:06-07:00 2008-04-03T21:03:06-07:00 Allow disabling signal handling in Server with :signals => false f00a5f8771386f5b8619b3c6aaec75bda48f2f77 macournoyer macournoyer@gmail.com