Merge pull request #55 from apptentive-engineering/fix_fields_for_1_2

logstash formatter updates for 1.2
roidrage · Nov 18, 2013 · f3f243b · f3f243b
2 parents 29e8aff + 5899685
commit f3f243b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/lib/lograge/formatters/logstash.rb b/lib/lograge/formatters/logstash.rb
@@ -3,7 +3,8 @@ module Formatters
     class Logstash
       def call(data)
         load_dependencies
-        event = LogStash::Event.new("@fields" => data)
+        event = LogStash::Event.new(data)
+
         event.message = "[#{data[:status]}] #{data[:method]} #{data[:path]} (#{data[:controller]}##{data[:action]})"
         event.to_json
       end
@@ -16,4 +17,4 @@ def load_dependencies
       end
     end
   end
-end
+end
diff --git a/spec/formatters/logstash_spec.rb b/spec/formatters/logstash_spec.rb
@@ -13,13 +13,10 @@
     }
   end
   subject { described_class.new.call(payload) }
-  it { should match(/"@source":"unknown"/) }
-  it { should match(/"@tags":\[\]/) }
-  it { should match(/"@fields":{/) }
   it { should match(/"custom":"data"/) }
   it { should match(/"status":200/) }
   it { should match(/"method":"GET"/) }
   it { should match(/"path":"\/"/) }
   it { should match(/"controller":"welcome"/) }
   it { should match(/"action":"index"/) }
-end
+end