rack-logstasher 0.0.1 → 0.0.2

data/lib/rack/logstasher/logger.rb

@@ -6,12 +6,13 @@ module Rack
     class Logger < Rack::CommonLogger
       def initialize(app, logger, opts = {})
         super(app, logger)
-        @extra_headers = opts[:extra_headers] || {}
+        @extra_request_headers = opts[:extra_request_headers] || {}
+        @extra_response_headers = opts[:extra_response_headers] || {}
       end
 
       private
 
-      def log(env, status, header, began_at)
+      def log(env, status, response_headers, began_at)
         now = Time.now
 
         data = {
@@ -22,16 +23,22 @@ module Rack
           :remote_addr => env['REMOTE_ADDR'],
           :parameters => env["QUERY_STRING"],
           :request => request_line(env),
-          :length => extract_content_length(header)
+          :length => extract_content_length(response_headers)
         }
 
-        @extra_headers.each do |header, log_key|
+        @extra_request_headers.each do |header, log_key|
           env_key = "HTTP_#{header.upcase.gsub('-', '_')}"
           if env[env_key]
             data[log_key] = env[env_key]
           end
         end
 
+        @extra_response_headers.each do |header, log_key|
+          if response_headers[header]
+            data[log_key] = response_headers[header]
+          end
+        end
+
         event = LogStash::Event.new('@fields' => data, '@tags' => ['request'])
         msg = event.to_json + "\n"
         if @logger.respond_to?(:write)

data/lib/rack/logstasher/version.rb

@@ -1,5 +1,5 @@
 module Rack
   module Logstasher
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/spec/logger_spec.rb

@@ -49,47 +49,96 @@ describe "Logger" do
 
     describe "adding extra headers to the log" do
       before :each do
-        @extra_headers = {}
+        @extra_request_headers = {}
+        @extra_response_headers = {}
       end
       def app
         Rack::Logstasher::Logger.new(
           proc {|env|
-            sleep @sleep_time if @sleep_time
-            [200, {}, ["Inner app response"]]
+            headers = @inner_response_headers || {}
+            [200, headers, ["Inner app response"]]
           },
           Logger.new(tmp_logfile_path),
-          :extra_headers => @extra_headers
+          :extra_request_headers => @extra_request_headers,
+          :extra_response_headers => @extra_response_headers
         )
       end
 
-      it "should add specified extra headers to the log under the given key" do
-        @extra_headers["foo"] = "header_foo"
-        get "/something", {}, {"HTTP_FOO" => "bar"}
+      context "extra request headers" do
+        it "should add specified extra request headers to the log under the given key" do
+          @extra_request_headers["foo"] = "header_foo"
+          get "/something", {}, {"HTTP_FOO" => "bar"}
 
-        log_details = JSON.parse(last_log_line)
-        fields = log_details['@fields']
+          log_details = JSON.parse(last_log_line)
+          fields = log_details['@fields']
 
-        expect(fields['header_foo']).to eq('bar')
-      end
+          expect(fields['header_foo']).to eq('bar')
+        end
+
+        it "should not add the key if the header is missing" do
+          @extra_request_headers["foo"] = "header_foo"
+          get "/something"
+
+          log_details = JSON.parse(last_log_line)
+          fields = log_details['@fields']
+
+          expect(fields).not_to have_key('header_foo')
+        end
 
-      it "should not add the key if the header is missing" do
-        @extra_headers["foo"] = "header_foo"
-        get "/something"
+        it "should handle dashes in header name" do
+          @extra_request_headers["Varnish-Id"] = "varnish_id"
+          get "/something", {}, {"HTTP_VARNISH_ID" => "1234"}
 
-        log_details = JSON.parse(last_log_line)
-        fields = log_details['@fields']
+          log_details = JSON.parse(last_log_line)
+          fields = log_details['@fields']
 
-        expect(fields).not_to have_key('header_foo')
+          expect(fields['varnish_id']).to eq('1234')
+        end
       end
 
-      it "should handle dashes in header name" do
-        @extra_headers["Varnish-Id"] = "varnish_id"
-        get "/something", {}, {"HTTP_VARNISH_ID" => "1234"}
+      context "extra response headers" do
+        it "should add specified extra response headers to the log under the given key" do
+          @extra_response_headers["foo"] = "header_foo"
+          @inner_response_headers = {"Foo" => "bar"}
+          get "/something"
+
+          log_details = JSON.parse(last_log_line)
+          fields = log_details['@fields']
+
+          expect(fields['header_foo']).to eq('bar')
+        end
+
+        it "should not add the key if the header is missing" do
+          @extra_response_headers["foo"] = "header_foo"
+          get "/something"
+
+          log_details = JSON.parse(last_log_line)
+          fields = log_details['@fields']
+
+          expect(fields).not_to have_key('header_foo')
+        end
+
+        it "should handle dashes in header name" do
+          @extra_response_headers["X-Cache"] = "cache_status"
+          @inner_response_headers = {"X-Cache" => "MISS"}
+          get "/something"
+
+          log_details = JSON.parse(last_log_line)
+          fields = log_details['@fields']
+
+          expect(fields['cache_status']).to eq('MISS')
+        end
+
+        it "should match header in a case-insensitive fashion" do
+          @extra_response_headers["X-CacHe"] = "cache_status"
+          @inner_response_headers = {"x-cAche" => "MISS"}
+          get "/something"
 
-        log_details = JSON.parse(last_log_line)
-        fields = log_details['@fields']
+          log_details = JSON.parse(last_log_line)
+          fields = log_details['@fields']
 
-        expect(fields['varnish_id']).to eq('1234')
+          expect(fields['cache_status']).to eq('MISS')
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-logstasher
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-17 00:00:00.000000000 Z
+date: 2013-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -161,7 +161,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1307778500513444384
+      hash: 946937473393142977
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -170,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1307778500513444384
+      hash: 946937473393142977
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23