Changeset 1237

Show
Ignore:
Timestamp:
01/09/08 14:32:59 (11 months ago)
Author:
e.@brainspl.at
Message:

a few stray Merb::Loggers that needed to be Merb.logger

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lib/merb/abstract_controller.rb

    r1228 r1237  
    264264      ) unless [Symbol, String].include? filter.class 
    265265 
    266       Merb::Logger.warn("Filter #{filter} was not found in your filter chain." 
     266      Merb.logger.warn("Filter #{filter} was not found in your filter chain." 
    267267      ) unless filters.reject! {|f| f.first.to_s[filter.to_s] } 
    268268    end 

  • trunk/lib/merb/boot_loader.rb

    r1228 r1237  
    184184                remove_constant(constant) 
    185185            rescue NameError => e 
    186               Merb::Logger.warn "Couldn't remove constant #{constant}" 
     186              Merb.logger.warn "Couldn't remove constant #{constant}" 
    187187            end 
    188188             
    …… 
    195195            rescue Exception => e 
    196196              puts "Error reloading file #{file}: #{e}" 
    197               Merb::Logger.warn "  Error: #{e}" 
     197              Merb.logger.warn "  Error: #{e}" 
    198198            end 
    199199             

  • trunk/lib/merb/mailer.rb

    r1228 r1237  
    44rescue LoadError 
    55  puts "You need to install the mailfactory gem to use Merb::Mailer" 
    6   Merb::Logger.warn "You need to install the mailfactory gem to use Merb::Mailer" 
     6  Merb.logger.warn "You need to install the mailfactory gem to use Merb::Mailer" 
    77end   
    88 

  • trunk/lib/merb/server.rb

    r1235 r1237  
    8080          trap("TERM") { exit } 
    8181          Dir.chdir Merb.root 
    82           if what == :mongrel_start 
    83             store_pid(Process.pid, port) 
    84           else 
    85             store_pid(Process.pid, "drb.#{port}") 
    86           end 
    8782          send(what, port) 
    8883        end 
    …… 
    9186      def webrick_start(port) 
    9287        Merb::BootLoader.initialize_merb 
     88        store_pid(Process.pid, port) 
    9389        require 'rack' 
    9490        require 'merb/rack_adapter' 
    …… 
    113109        puts "Starting merb drb server on port: #{port}" 
    114110        require 'merb/drb_server' 
     111        Merb::BootLoader.initialize_merb 
     112        store_pid(Process.pid, "drb.#{port}") 
    115113        drb_init = File.join(Merb.root, "/config/drb_init") 
    116114        require drb_init if File.exist?(drb_init)