Ruby 1.8.7 compatibility for LogStash::Event

This commit is contained in:
David Butler 2012-12-16 23:56:13 -08:00
parent 6fde43ccf0
commit d8a37f49b5
4 changed files with 11 additions and 7 deletions

View file

@ -1,3 +1,3 @@
require "logstash/event"
require "logstash/version"
require File.join(File.dirname(__FILE__), "logstash/event")
require File.join(File.dirname(__FILE__), "logstash/version")

View file

@ -1,8 +1,8 @@
require "json"
require "time"
require "date"
require "logstash/time"
require "logstash/namespace"
require File.join(File.dirname(__FILE__), "time")
require File.join(File.dirname(__FILE__), "namespace")
require "uri"
# General event type.
@ -24,7 +24,7 @@ class LogStash::Event
@data["@timestamp"] ||= LogStash::Time.now
end # def initialize
if RUBY_ENGINE == "jruby"
if defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
@@date_parser = Java::org.joda.time.format.ISODateTimeFormat.dateTimeParser.withOffsetParsed
else
# TODO(sissel): LOGSTASH-217

View file

@ -1,4 +1,4 @@
require "logstash/namespace"
require File.join(File.dirname(__FILE__), "namespace")
# Provide our own Time wrapper for ISO8601 support
# Example:
@ -8,7 +8,7 @@ require "logstash/namespace"
# >> LogStash::Time.now.utc.to_iso8601
# => "2010-10-17 07:25:26.788704Z"
module LogStash::Time
if RUBY_ENGINE == "jruby"
if defined?(RUBY_ENGINE) && (RUBY_ENGINE == "jruby")
require "java"
DateTime = org.joda.time.DateTime
DateTimeZone = org.joda.time.DateTimeZone

View file

@ -15,6 +15,7 @@ Gem::Specification.new do |gem|
lib/logstash/namespace.rb
lib/logstash/time.rb
lib/logstash/version.rb
lib/spec/event.rb
LICENSE
}
@ -22,4 +23,7 @@ Gem::Specification.new do |gem|
gem.name = "logstash-event"
gem.require_paths = ["lib"]
gem.version = LOGSTASH_VERSION
gem.add_development_dependency "rspec"
gem.add_development_dependency "insist", "0.0.8"
end