sinatra-request-logger 0.1.0 → 0.2.0

data/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
-:minor: 1
+:minor: 2
 :patch: 0

data/lib/sinatra/request-logger.rb

@@ -1,56 +1,48 @@
 module Sinatra
   module RequestLogger
     def self.registered(app)
-      app.use RequestLogger, app.logger
-      app.set :show_exceptions, false
-      app.error do
-        settings.logger.info("#{env['sinatra.error'].class} (#{env['sinatra.error'].message})")
-        settings.logger.info(env['sinatra.error'].backtrace.join("\n"))
-      end
+      app.set :proxy_logger, ProxyLogger.new(app.logger)
+      app.use Rack::CommonLogger, app.proxy_logger
+      app.use ErrorLogger, app.proxy_logger
     end
 
-    class RequestLogger
-      # Common Log Format: http://httpd.apache.org/docs/1.3/logs.html#common
-      # lilith.local - - [07/Aug/2006 23:58:02] "GET / HTTP/1.1" 500 -
-      # %{%s - %s [%s] "%s %s%s %s" %d %s\n} %
-      FORMAT = %{%s - %s [%s] "%s %s%s %s" %d %s %0.4f}
-
-      def initialize(app, logger=nil)
-        @app = app
+    class ProxyLogger
+      def initialize(logger)
         @logger = logger
       end
 
-      def call(env)
-        began_at = Time.now
-        status, header, body = @app.call(env)
-        header = Rack::Utils::HeaderHash.new(header)
-        log(env, status, header, began_at)
-        [status, header, body]
+      def write(msg)
+        @logger.info(msg)
+      end
+
+      def flush
+        #nothing
       end
 
-      private
+      def puts(msg)
+        if msg.is_a?(Array)
+          @logger.info(msg.map(&:chomp).join("\n"))
+        elsif msg.is_a?(String)
+          @logger.info(msg.chomp)
+        else
+          @logger.info(msg)
+        end
+      end
 
-      def log(env, status, header, began_at)
-        now = Time.now
-        length = extract_content_length(header)
+      def method_missing(method, *args)
+        @logger.send(method, *args)
+      end
+    end
 
-        logger = @logger || env['rack.errors']
-        logger.info FORMAT % [
-          env['HTTP_X_FORWARDED_FOR'] || env["REMOTE_ADDR"] || "-",
-          env["REMOTE_USER"] || "-",
-          now.strftime("%d/%b/%Y %H:%M:%S"),
-          env["REQUEST_METHOD"],
-          env["PATH_INFO"],
-          env["QUERY_STRING"].empty? ? "" : "?"+env["QUERY_STRING"],
-          env["HTTP_VERSION"],
-          status.to_s[0..3],
-          length,
-          now - began_at ]
+    class ErrorLogger
+      def initialize(app, logger)
+        @app = app
+        @logger = logger
       end
 
-      def extract_content_length(headers)
-        value = headers['Content-Length'] or return '-'
-        value.to_s == '0' ? '-' : value
+      def call(env)
+        env['rack.errors'] = @logger
+        @app.call(env)
       end
     end
   end

data/sinatra-request-logger.gemspec

@@ -0,0 +1,54 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{sinatra-request-logger}
+  s.version = "0.2.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Cyril Mougel"]
+  s.date = %q{2010-05-03}
+  s.description = %q{Log request and error on Logger send it by settings}
+  s.email = %q{cyril@yeastymobs.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION.yml",
+     "lib/sinatra/request-logger.rb",
+     "sinatra-request-logger.gemspec",
+     "test/helper.rb",
+     "test/test_sinatra-logger.rb"
+  ]
+  s.homepage = %q{http://github.com/shingara/sinatra-request-logger}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.6}
+  s.summary = %q{Log all request and error on Logger}
+  s.test_files = [
+    "test/helper.rb",
+     "test/test_sinatra-logger.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<sinatra>, [">= 1.0.0"])
+    else
+      s.add_dependency(%q<sinatra>, [">= 1.0.0"])
+    end
+  else
+    s.add_dependency(%q<sinatra>, [">= 1.0.0"])
+  end
+end
+

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Cyril Mougel
@@ -48,6 +48,7 @@ files:
 - Rakefile
 - VERSION.yml
 - lib/sinatra/request-logger.rb
+- sinatra-request-logger.gemspec
 - test/helper.rb
 - test/test_sinatra-logger.rb
 has_rdoc: true