Ruby on Rails | Screencasts | Download | Documentation | Weblog | Community | Source

Changeset 4507

Show
Ignore:
Timestamp:
06/29/06 00:57:54 (3 years ago)
Author:
bitsweat
Message:

script/server prefers mongrel over lighttpd

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/railties/CHANGELOG

    r4506 r4507  
    11*SVN* 
    22 
    3 * Mongrel: script/server tails the rails log like it does with lighttpd. #5541 [mike@clarkware.com] 
     3* Mongrel: script/server tails the rails log like it does with lighttpd. Prefer mongrel over lighttpd. #5541 [mike@clarkware.com] 
    44 
    55* Don't assume Active Record is available. #5497 [bob@sporkmonger.com] 
  • trunk/railties/lib/commands/server.rb

    r4504 r4507  
    1818    ARGV.shift 
    1919  else 
    20     if RUBY_PLATFORM !~ /mswin/ && !silence_stderr { `lighttpd -version` }.blank? && defined?(FCGI) 
     20    if defined?(Mongrel) 
     21      "mongrel" 
     22    elsif RUBY_PLATFORM !~ /mswin/ && !silence_stderr { `lighttpd -version` }.blank? && defined?(FCGI) 
    2123      "lighttpd" 
    22     elsif defined?(Mongrel)  
    23       "mongrel" 
    2424    else 
    2525      "webrick"