From ef816ae23cac3e613fe2ee0ab69c665347cab68d Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Tue, 11 Mar 2014 11:16:37 -0400 Subject: [PATCH 1/2] Fix event::overwrite to copy timestamp properly --- lib/logstash/event.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/logstash/event.rb b/lib/logstash/event.rb index f4dde9c5b..06a146c0e 100644 --- a/lib/logstash/event.rb +++ b/lib/logstash/event.rb @@ -175,6 +175,10 @@ class LogStash::Event public def overwrite(event) @data = event.to_hash + #convert timestamp if it is a String + if @data["@timestamp"].is_a?(String) + @data["@timestamp"] = LogStash::Time.parse_iso8601(@data["@timestamp"]) + end end public From 2435c63770bfc1aad1fd7ca055ca8ca044fec5a0 Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Tue, 11 Mar 2014 11:42:39 -0400 Subject: [PATCH 2/2] updates as per code review --- lib/logstash/event.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/logstash/event.rb b/lib/logstash/event.rb index 06a146c0e..9e54c6a2f 100644 --- a/lib/logstash/event.rb +++ b/lib/logstash/event.rb @@ -176,8 +176,8 @@ class LogStash::Event def overwrite(event) @data = event.to_hash #convert timestamp if it is a String - if @data["@timestamp"].is_a?(String) - @data["@timestamp"] = LogStash::Time.parse_iso8601(@data["@timestamp"]) + if @data[TIMESTAMP].is_a?(String) + @data[TIMESTAMP] = LogStash::Time.parse_iso8601(@data[TIMESTAMP]) end end