@@ -1,5 +1,13 @@ module Rack class Superlogger + module LogProcessor + class Base # may be async or sth + def initalize(logger, env, response) + + end + end + end + REQUEST_METHODS = Rack::Request.public_instance_methods(false). reject { |method_name| method_name =~ /[=\[]|content_length/ }.freeze @@ -11,7 +19,8 @@ module Rack def call(env) - env["rack.superlogger"] = {} + env["rack.superlogger.data"] = {} + before = Time.now.to_f status, headers, body = @app.call(env) @@ -20,15 +29,15 @@ module Rack message = @template.dup request = Rack::Request.new(env) - env["rack.superlogger"][:duration] = duration.to_s if message.include? ":duration" - env["rack.superlogger"][:status] = status.to_s if message.include? ":status" - env["rack.superlogger"][:content_length] = headers["Content-length"] if message.include? ":content_length" + env["rack.superlogger.data"][:duration] = duration.to_s if message.include? ":duration" + env["rack.superlogger.data"][:status] = status.to_s if message.include? ":status" + env["rack.superlogger.data"][:content_length] = headers["Content-length"] if message.include? ":content_length" REQUEST_METHODS.each do |method_name| - env["rack.superlogger"][method_name.to_sym] = request.send(method_name.to_sym) if message.include?(":#{method_name}") + env["rack.superlogger.data"][method_name.to_sym] = request.send(method_name.to_sym) if message.include?(":#{method_name}") end - env["rack.superlogger"].each do |k, v| + env["rack.superlogger.data"].each do |k, v| message.gsub! ":#{k}", v.to_s end lib/rack/contrib/superlogger.rb @@ -7,8 +7,8 @@ require 'mocha' context "Rack::Superlogger" do def test_response(logger, template) app = lambda { |env| - env["rack.superlogger"][:some_var] = "foobar" - env["rack.superlogger"][:something_else] = "kiszonka" + env["rack.superlogger.data"][:some_var] = "foobar" + env["rack.superlogger.data"][:something_else] = "kiszonka" [200, { "Content-type" => "test/plain", "Content-length" => "3" }, ["foo"]] } test/spec_rack_superlogger.rb ddf6eb726f3bee9cffc16876d2a6bc55c73bdc4d Maciej Lotkowski maciej.lotkowski@zenbe.com http://github.com/ml/rack-contrib/commit/bc959056e1d5ac42d6d8704d3c8e18cc19d8111b bc959056e1d5ac42d6d8704d3c8e18cc19d8111b 2009-11-05T12:33:51-08:00 2009-11-05T12:33:51-08:00 changed env key for logger data hash 9a54e7e0d27fcbbc812278b220522143e0f368f0 Maciej Lotkowski maciej.lotkowski@zenbe.com