Changeset 1238

Show
Ignore:
Timestamp:
01/09/08 14:58:12 (9 months ago)
Author:
e.@brainspl.at
Message:

make sure pid file is properly written

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lib/merb/server.rb

    r1237 r1238  
    5252       
    5353      def store_pid(pid,port) 
    54         File.open("#{Merb.root}/log/merb.#{port}.pid", 'w'){|f| f.write("#{Process.pid}\n")} 
     54        File.open("#{Merb::Config[:merb_root]}/log/merb.#{port}.pid", 'w'){|f| f.write("#{Process.pid}\n")} 
    5555      end   
    5656       
    …… 
    7979          STDERR.reopen STDOUT 
    8080          trap("TERM") { exit } 
    81           Dir.chdir Merb.root 
     81          Dir.chdir Merb::Config[:merb_root] 
    8282          send(what, port) 
    8383        end 
    …… 
    118118       
    119119      def mongrel_start(port) 
     120        store_pid(Process.pid, port) 
    120121        Merb::Config[:port] = port 
    121122        unless  Merb::Config[:generate] ||  Merb::Config[:console] ||  Merb::Config[:only_drb] ||  Merb::Config[:kill]