Changeset 979

Show
Ignore:
Timestamp:
11/12/07 19:06:15 (1 year ago)
Author:
e.@brainspl.at
Message:

better errors if EVENT or SWIFT is set but swiftiply was not installed

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/README

    r902 r979  
    5353        $ merb -i 
    5454         
    55 To see all the available command loine flags use: 
     55To see all the available command line flags use: 
    5656  
    5757  $ merb -h      

  • trunk/lib/merb.rb

    r887 r979  
    11require 'rubygems' 
    22if ENV['SWIFT'] 
    3  require 'swiftcore/swiftiplied_mongrel' 
    4  puts "Using Swiftiplied Mongrel" 
     3  begin 
     4    require 'swiftcore/swiftiplied_mongrel' 
     5    puts "Using Swiftiplied Mongrel" 
     6  rescue LoadError 
     7    require 'mongrel' 
     8        puts "SWIFT variable set but not installed - falling back to normal Mongrel" 
     9  end 
    510elsif ENV['EVENT'] 
    6   require 'swiftcore/evented_mongrel'  
    7   puts "Using Evented Mongrel" 
     11  begin 
     12    require 'swiftcore/evented_mongrel'  
     13    puts "Using Evented Mongrel" 
     14  rescue LoadError 
     15    require 'mongrel' 
     16        puts "EVENT variable set but swiftiply not installed - falling back to normal Mongrel" 
     17  end 
    818else 
    919 require 'mongrel'