@@ -1,4 +1,6 @@ == 1.0.0 The Big release + * Runner now remembers -r, -D and -V parameters so that clustered servers inherit those and + `restart` keep your parameters. * Make Set-Cookie header, in Rails adapter, compatible with current Rack spec [Pedro Belo] [#73, state:resolved] * Add --no-epoll option to disable epoll usage on Linux [#61 state:resolved] CHANGELOG @@ -57,7 +57,7 @@ You need to setup a config.ru file and pass it to the thin script: run app - thin start -r config.ru + thin start -R config.ru See example directory for more samples and run 'thin -h' for usage. README @@ -40,7 +40,8 @@ module Thin :log => 'log/thin.log', :pid => 'tmp/pids/thin.pid', :max_conns => Server::DEFAULT_MAXIMUM_CONNECTIONS, - :max_persistent_conns => Server::DEFAULT_MAXIMUM_PERSISTENT_CONNECTIONS + :max_persistent_conns => Server::DEFAULT_MAXIMUM_PERSISTENT_CONNECTIONS, + :requires => [] } parse! @@ -116,9 +117,9 @@ module Thin opts.separator "" opts.separator "Common options:" - opts.on_tail("-r", "--require FILE", "require the library") { |file| ruby_require file } - opts.on_tail("-D", "--debug", "Set debbuging on") { Logging.debug = true } - opts.on_tail("-V", "--trace", "Set tracing on (log raw request/response)") { Logging.trace = true } + opts.on_tail("-r", "--require FILE", "require the library") { |file| @options[:requires] << file } + opts.on_tail("-D", "--debug", "Set debbuging on") { @options[:debug] = true } + opts.on_tail("-V", "--trace", "Set tracing on (log raw request/response)") { @options[:trace] = true } opts.on_tail("-h", "--help", "Show this message") { puts opts; exit } opts.on_tail('-v', '--version', "Show version") { puts Thin::SERVER; exit } end @@ -157,6 +158,10 @@ module Thin # relative to this one. Dir.chdir(@options[:chdir]) unless CONFIGLESS_COMMANDS.include?(@command) + @options[:requires].each { |r| ruby_require r } + Logging.debug = @options[:debug] + Logging.trace = @options[:trace] + controller = case when cluster? then Controllers::Cluster.new(@options) when service? then Controllers::Service.new(@options) lib/thin/runner.rb @@ -217,6 +217,9 @@ ENDIF:title <li><a href="/thin/download/">download</a></li> <li><a href="/thin/usage/">usage</a></li> <li><a href="/thin/doc/">doc</a></li> + <li><a href="http://github.com/macournoyer/thin/">code</a></li> + <li><a href="http://thin.lighthouseapp.com/projects/7212-thin/">bugs</a></li> + <li><a href="/thin/users/">users</a></li> <li><a href="http://groups.google.com/group/thin-ruby/">community</a></li> </ul> <div id="sidebar"> site/rdoc.rb @@ -13,7 +13,7 @@ describe Runner do Runner.new(%w(stop)).command.should == 'stop' Runner.new(%w(restart)).command.should == 'restart' end - + it "should abort on unknow command" do runner = Runner.new(%w(poop)) @@ -66,14 +66,33 @@ describe Runner do it "should warn when require a rack config file" do STDERR.stub!(:write) STDERR.should_receive(:write).with(/WARNING:/) - + runner = Runner.new(%w(start -r config.ru)) + runner.run! rescue nil runner.options[:rackup].should == 'config.ru' end it "should require file" do - proc { Runner.new(%w(start -r unexisting)) }.should raise_error(LoadError) + runner = Runner.new(%w(start -r unexisting)) + proc { runner.run! }.should raise_error(LoadError) + end + + it "should remember requires" do + runner = Runner.new(%w(start -r rubygems -r thin)) + runner.options[:requires].should == %w(rubygems thin) + end + + it "should remember debug options" do + runner = Runner.new(%w(start -D -V)) + runner.options[:debug].should be_true + runner.options[:trace].should be_true + end + + it "should default debug and trace to false" do + runner = Runner.new(%w(start)) + runner.options[:debug].should_not be_true + runner.options[:trace].should_not be_true end end spec/runner_spec.rb f67fb1820ad5d790655c85bbc410a99fe1bea28d macournoyer macournoyer@gmail.com http://github.com/macournoyer/thin/commit/a8ed858fcd39ac6b6cab0fa03853b3ed479a30a3 a8ed858fcd39ac6b6cab0fa03853b3ed479a30a3 2008-07-18T08:39:43-07:00 2008-07-18T08:39:43-07:00 Runner now remembers -r, -D and -V parameters so that clustered servers inherit those and `restart` keep your parameters. a0ba067fd9fb525f4462cd41fe6f6b34ae062ee6 macournoyer macournoyer@gmail.com