@@ -380,7 +380,7 @@ class Merb::BootLoader::LoadClasses < Merb::BootLoader @ran = true $0 = "merb: master" - if Merb::Config[:fork_for_class_load] + if Merb::Config[:fork_for_class_load] && !Merb.env == "test" start_transaction else trap('INT') do lib/merb-core/bootloader.rb @@ -82,7 +82,7 @@ module Merb rescue Errno::EACCES => e Merb.fatal! e.message, e rescue Errno::ENOENT => e - Merb.fatal! "Could not find a PID file at #{pid_file(port)}", e + Merb.fatal! "Could not find a PID file at #{pid_file(port)}", e end if sig.is_a?(Integer) sig = Signal.list.invert[sig] @@ -236,10 +236,7 @@ module Merb def pid_files if Merb::Config[:pid_file] if Merb::Config[:cluster] - ext = File.extname(Merb::Config[:pid_file]) - base = File.basename(Merb::Config[:pid_file], ext) - dir = File.dirname(Merb::Config[:pid_file]) - Dir[dir / "#{base}.*#{ext}"] + Dir[Merb::Config[:pid_file] % "*"] else [ Merb::Config[:pid_file] ] end lib/merb-core/server.rb @@ -56,12 +56,12 @@ describe Merb::Config do it "should support -c to set the number of cluster nodes" do Merb::Config.parse_args(["-c", "4"]) - Merb::Config[:cluster].should == "4" + Merb::Config[:cluster].should == 4 end it "should support -p to set the port number" do Merb::Config.parse_args(["-p", "6000"]) - Merb::Config[:port].should == "6000" + Merb::Config[:port].should == 6000 end it "should support -o to set the socket filename" do @@ -76,12 +76,12 @@ describe Merb::Config do it "should support -s to set the socket number" do Merb::Config.parse_args(["-s", "0"]) - Merb::Config[:socket].should == "0" + Merb::Config[:socket].should == 0 end it "should support --socket to set the socket number" do Merb::Config.parse_args(["--socket", "3"]) - Merb::Config[:socket].should == "3" + Merb::Config[:socket].should == 3 end it "should support -P to set the PIDfile" do @@ -96,7 +96,7 @@ describe Merb::Config do end it "should support setting of PIDfile with cluster nodes" do - Merb::Config.parse_args(["-P", "/tmp/merb.pidfile", "-c", "2", "-p", "6000"]) + Merb::Config.parse_args(["-P", "/tmp/merb.%s.pidfile", "-c", "2", "-p", "6000"]) Merb::Server.pid_file(6000).should == "/tmp/merb.6000.pidfile" Merb::Server.pid_file(6001).should == "/tmp/merb.6001.pidfile" @@ -144,12 +144,12 @@ describe Merb::Config do end it "should support -K for a graceful kill" do - Merb::Server.should_receive(:kill).with("all", 1) + Merb::Server.should_receive(:kill).with("main", 2) Merb.start(["-K", "all"]) end it "should support -k for a hard kill" do - Merb::Server.should_receive(:kill).with("all", 9) + Merb::Server.should_receive(:kill).with("main", 9) Merb.start(["-k", "all"]) end spec/private/config/config_spec.rb 67e1756c267edb27f0229e0e7f9883736868742a Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/afc291cd9d5c660c4071741b21e79a3df62223f2 afc291cd9d5c660c4071741b21e79a3df62223f2 2008-09-27T18:27:12-07:00 2008-09-27T13:23:28-07:00 Tests pass: we don't need to fork for class load in test env, plus update config spec for some small changes to the internal API 9cdf7dc797772bbf506d7431ca00f168af4b1acf Yehuda Katz wycats@gmail.com