0
@@ -189,7 +189,10 @@
0
       def pid_files
0
         if Merb::Config[:pid_file]
0
           if Merb::Config[:cluster]
0
-            Dir[Merb::Config[:pid_file] + ".*.pid"]
0
+            ext = File.extname(Merb::Config[:pid_file])
0
+            base = File.basename(Merb::Config[:pid_file], ext)
0
+            dir = File.dirname(Merb::Config[:pid_file])
0
+            Dir[dir / "#{base}.*#{ext}"]
0
           else
0
             [ Merb::Config[:pid_file] ]
0
           end

0
@@ -71,18 +71,25 @@
0
 
0
   it "should have server return PIDfile setting as is with no cluster nodes" do
0
     Merb::Config.parse_args(["-P", "pidfile", "-p", "6000"])
0
-    Merb::Server.pid_file(6000).should == "pidfile"
0
+    Merb::Server.pid_file(6000).should == "pidfile"    
0
+    Merb::Server.pid_files.should == ["pidfile"]
0
   end
0
 
0
   it "should support setting of PIDfile with cluster nodes" do
0
     Merb::Config.parse_args(["-P", "/tmp/merb.pidfile", "-c", "2", "-p", "6000"])
0
     Merb::Server.pid_file(6000).should == "/tmp/merb.6000.pidfile"
0
     Merb::Server.pid_file(6001).should == "/tmp/merb.6001.pidfile"
0
+    
0
+    Dir.should_receive(:[]).with("/tmp/merb.*.pidfile")
0
+    Merb::Server.pid_files
0
   end
0
 
0
   it "should support default PIDfile setting" do
0
     Merb::Config.parse_args(["-p", "6000"])
0
     Merb::Server.pid_file(6000).should == Merb.log_path / "merb.6000.pid"
0
+    
0
+    Dir.should_receive(:[]).with(Merb.log_path / "merb.*.pid")
0
+    Merb::Server.pid_files
0
   end
0
 
0
   it "should support -h to set the hostname" do