@@ -1,4 +1,5 @@ == ? release + * Fix regression when --only option is used w/ --socket. * Add process name 'tag' functionality. Easier to distinguish thin daemons from eachother in process listing [ctcherry] CHANGELOG @@ -102,9 +102,9 @@ module Thin def with_each_server if only - if only < 80 + if first_port && only < 80 # interpret +only+ as a sequence number - yield(first_port + only) + yield first_port + only else # interpret +only+ as an absolute port number yield only lib/thin/controllers/cluster.rb @@ -135,6 +135,29 @@ describe Cluster, "controlling only one server" do end end +describe Cluster, "controlling only one server with UNIX socket" do + before do + @cluster = Cluster.new(:chdir => '/rails_app', + :socket => '/tmp/thin.sock', + :address => '0.0.0.0', + :port => 3000, + :servers => 3, + :timeout => 10, + :log => 'thin.log', + :pid => 'thin.pid', + :only => 1 + ) + end + + it 'should call only specified server' do + calls = [] + @cluster.send(:with_each_server) do |n| + calls << n + end + calls.should == [1] + end +end + describe Cluster, "controlling only one server, by sequence number" do before do @cluster = Cluster.new(:chdir => '/rails_app', spec/controllers/cluster_spec.rb bb3c6dd7a75b590f4c26220d7d8550dd96b3fda7 macournoyer macournoyer@gmail.com http://github.com/macournoyer/thin/commit/95a060a8898a44bf038c4222eb072c554738d40d 95a060a8898a44bf038c4222eb072c554738d40d 2009-05-21T13:13:56-07:00 2009-05-21T13:13:56-07:00 Fix regression when --only option is used w/ --socket. caff3cc3079634ed5b0ea02ce869d8da3131aa57 macournoyer macournoyer@gmail.com