Changeset 1246

Show
Ignore:
Timestamp:
01/09/08 18:55:43 (8 months ago)
Author:
wayneesegu..@gmail.com
Message:

Updated jerbivore MERB_LOGGER => Merb.logger

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • plugins/jerbivore/lib/jerbivore/servlet_handler.rb

    r892 r1246  
    2020 
    2121        request = ServletHandler::Request.new(servlet_request, input) 
    22         MERB_LOGGER.info("\nRequest: REQUEST_URI: #{servlet_request.getRequestURI}  (#{Time.now.strftime("%Y-%m-%d %H:%M:%S")})") 
     22        Merb.logger.info("\nRequest: REQUEST_URI: #{servlet_request.getRequestURI}  (#{Time.now.strftime("%Y-%m-%d %H:%M:%S")})") 
    2323 
    2424        if @@path_prefix 
    2525          if request.params['REQUEST_URI'] =~ @@path_prefix 
    26             MERB_LOGGER.info("Path prefix #{@@path_prefix.inspect} removed from PATH_INFO and REQUEST_URI") 
     26            Merb.logger.info("Path prefix #{@@path_prefix.inspect} removed from PATH_INFO and REQUEST_URI") 
    2727            request.params['REQUEST_URI'].sub!(@@path_prefix, '') 
    2828            request.params['PATH_INFO'].sub!(@@path_prefix, '') 
    …… 
    3737        benchmarks[:action]     = action 
    3838         
    39         MERB_LOGGER.info("Routing to controller: #{controller.class} action: #{action}\nRoute Recognition & Parsing HTTP Input took: #{benchmarks[:setup_time]} seconds") 
     39        Merb.logger.info("Routing to controller: #{controller.class} action: #{action}\nRoute Recognition & Parsing HTTP Input took: #{benchmarks[:setup_time]} seconds") 
    4040         
    4141        # TODO: handle X-SENDFILE  
    …… 
    5151        total_request_time = Time.now - start 
    5252        benchmarks[:total_request_time] = total_request_time 
    53         MERB_LOGGER.info("Request Times: #{benchmarks.inspect}\nResponse status: #{servlet_response.status}\nComplete Request took: #{total_request_time} seconds, #{1.0/total_request_time} Requests/Second\n\n") 
     53        Merb.logger.info("Request Times: #{benchmarks.inspect}\nResponse status: #{servlet_response.status}\nComplete Request took: #{total_request_time} seconds, #{1.0/total_request_time} Requests/Second\n\n") 
    5454      rescue Object => e 
    5555        servlet_response.setStatus(500) 
    5656        output.write("500 Internal Server Error") 
    5757        output.flush 
    58         MERB_LOGGER.error(Merb.exception(e)) 
     58        Merb.logger.error(Merb.exception(e)) 
    5959      ensure 
    60         MERB_LOGGER.flush 
     60        Merb.logger.flush 
    6161      end 
    6262    end