logstash-logger 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 289d8d944755e6c3be2857d075b37d8e5c560a45
-  data.tar.gz: 8fdff518b64fdb1c71dc60ba6f9f75183a092831
+  metadata.gz: 4495e92019c98077d726a256f7713ffb43b1a6f2
+  data.tar.gz: 2768785f7ae86851d7f09d2270a5fb8565ec4080
 SHA512:
-  metadata.gz: dc0992ffd0c6e3478d8018590bcb16fbd436713672c4fc9a6a64595d563002cea11e8f4dae61eb8c99b239f29215213c5ac1dd4dcfccf6ac766a5b241807848c
-  data.tar.gz: ad911e6164b8fc9d53d7f0afb54b68ce0d3f8eef091f4513920cb5fab8645cb5b3366b81c7e7763d491b342140f906bad55a101b341d2857a760252f59789e4c
+  metadata.gz: b1931b2ca5c0bbd7bf786f04f7226d846d499bb5ec0b316412d6fc69e050bb7858cfdf201f70c09c287f225be6fdd96962bf7493cf64fc7afe5925b944eddd11
+  data.tar.gz: a521fe134818cc560c90a906291622352370c84ec5e9de4a9e223544426efd091b204a0724e16bf584bb554950bbb00ffe26c7b6056b839fc06d9cf51e758e92

data/.travis.yml

@@ -1,10 +1,7 @@
 language: ruby
 rvm:
-#  - ree
-#  - 1.8.7
   - 1.9.3
   - 2.0.0
-#  - jruby-18mode # JRuby in 1.8 mode
   - jruby-19mode # JRuby in 1.9 mode
 #  - rbx-18mode
 #  - rbx-19mode

data/README.md

@@ -1,7 +1,7 @@
 # LogStashLogger [![Build Status](https://travis-ci.org/dwbutler/logstash-logger.png?branch=master)](https://travis-ci.org/dwbutler/logstash-logger)
 
 This gem implements a subclass of Ruby's Logger class that logs directly to [logstash](http://logstash.net).
-It writes to a logstash listener over a TCP connection, in logstash JSON format. This is an improvement over
+It writes to a logstash listener over a UDP (default) or TCP connection, in logstash JSON format. This is an improvement over
 writing to a file or syslog since logstash can receive the structured data directly.
 
 ## Features
@@ -72,15 +72,21 @@ For a more detailed discussion of UDP vs TCP, I recommend reading this article:
 
 Verified to work with:
 
-* Ruby 1.9.3
-* Ruby 2.0.0
+* MRI Ruby 1.9.3
+* MRI Ruby 2.0.0
 * JRuby 1.7+ (1.9 mode)
 
-Ruby 1.8.7 is not supported because LogStash::Event is not compatible with Ruby 1.8.7. This might change in the future.
+Ruby 1.8.7 is not supported because LogStash::Event is not compatible with Ruby 1.8.7. This will probably not change.
 
 The specs don't pass in Rubinius yet, but the logger does work.
 
-## Breaking change in version 0.3+
+## Breaking changes
+
+### Version 0.4+
+Logstash::Event decided to go ahead and break the existing JSON format starting in version 1.2+. If you're using this version, you'll need to install
+LogStashLogger version 0.4+. This is not backwards compatible with the old LogStash::Event v1.1.5.
+
+### Version 0.3+
 Earlier versions of this gem (<= 0.2.1) only implemented a TCP connection. Newer versions (>= 0.3) also implement UDP, and use that as the new default.
 Please be aware if you are using the default constructor and still require TCP, you should add an additional argument:
 

data/lib/logstash-logger.rb

@@ -1,7 +1,7 @@
 require 'logstash-logger/version'
 
 require 'socket'
-require 'logstash-event'
+require 'logstash/event'
 
 require 'logstash-logger/socket'
 require 'logstash-logger/logger'

data/lib/logstash-logger/logger.rb

@@ -2,7 +2,7 @@ class LogStashLogger < ::Logger
   
   attr_reader :client
   
-  LOGSTASH_EVENT_FIELDS = %w(@timestamp @tags @type @source @fields @message).freeze
+  LOGSTASH_EVENT_FIELDS = %w(@timestamp @tags @type @source @fields message).freeze
   HOST = ::Socket.gethostname
   
   def initialize(host, port, socket_type=:udp)
@@ -24,7 +24,7 @@ class LogStashLogger < ::Logger
       end
     end
     @logdev.write(
-      format_message(format_severity(severity), LogStash::Time.now, progname, message))
+      format_message(format_severity(severity), Time.now, progname, message))
     true
   end
   
@@ -51,13 +51,13 @@ class LogStashLogger < ::Logger
       event_data["@fields"].merge!(data)
       LogStash::Event.new(event_data)
     when String
-      LogStash::Event.new("@message" => data, "@timestamp" => time)
+      LogStash::Event.new("message" => data, "@timestamp" => time)
     end
     
     event['severity'] ||= severity
     #event.type = progname
-    if event.source == 'unknown'
-      event["@source"] = HOST
+    if event['source'] == 'unknown'
+      event['source'] = HOST
     end
     
     event

data/lib/logstash-logger/version.rb

@@ -1,5 +1,5 @@
 require 'logger'
 
 class LogStashLogger < ::Logger
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/logstash-logger.gemspec

@@ -17,7 +17,8 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
   
-  gem.add_runtime_dependency 'logstash-event'
+  gem.add_runtime_dependency 'logstash-event', '~> 1.2'
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'wwtd'
 end

data/spec/logger_spec.rb

@@ -32,7 +32,7 @@ describe LogStashLogger do
   # The logstash event to log
   let(:logstash_event) do
     LogStash::Event.new.tap do |event|
-      event.message = 'test'
+      event['message'] = 'test'
       event['severity'] = 'INFO'
     end
   end
@@ -72,31 +72,31 @@ describe LogStashLogger do
     logdev.should_receive(:write).and_call_original do |event|
       event.should be_a LogStash::Event
       event.source.should eql(hostname)
-      event.message.should eql(message)
+      event['message'].should eql(message)
       event['severity'].should eql('INFO')
     end
 
     logger.info(message)
     
-    listener_event.message.should == message
+    listener_event['message'].should == message
   end
   
   it 'takes a logstash-formatted json string as input and writes out a logstash event' do
     logdev.should_receive(:write).and_call_original do |event|
       event.should be_a LogStash::Event
-      event.message.should eql(logstash_event.message)
+      event['message'].should eql(logstash_event['message'])
       event.source.should eql(hostname)
     end
 
     logger.info(logstash_event.to_json)
     
-    listener_event.message.should == logstash_event.message
+    listener_event['message'].should == logstash_event['message']
   end
   
   it 'takes a LogStash::Event as input and writes it out intact' do
     logdev.should_receive(:write).and_call_original do |event|
       event.should be_a LogStash::Event
-      event.message.should eql(logstash_event.message)
+      event['message'].should eql(logstash_event['message'])
       event['severity'].should eql(logstash_event['severity'])
       event.timestamp.should eql(logstash_event.timestamp)
       event.source.should eql(hostname)
@@ -104,26 +104,26 @@ describe LogStashLogger do
     
     logger.warn(logstash_event)
     
-    listener_event.message.should == logstash_event.message
+    listener_event['message'].should == logstash_event['message']
     listener_event['severity'].should == logstash_event['severity']
   end
   
   it 'takes a data hash as input and writes out a logstash event' do
     data = {
-      "@message" => 'test',
+      "message" => 'test',
       'severity' => 'INFO'
     }
     
     logdev.should_receive(:write).and_call_original do |event|
       event.should be_a LogStash::Event
-      event.message.should eql('test')
+      event['message'].should eql('test')
       event['severity'].should eql('INFO')
       event.source.should eql(hostname)
     end
 
     logger.info(data.dup)
     
-    listener_event.message.should == data["@message"]
+    listener_event['message'].should == data["message"]
     listener_event['severity'].should == data['severity']
   end
   

metadata

@@ -1,23 +1,37 @@
 --- !ruby/object:Gem::Specification
 name: logstash-logger
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - David Butler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-08 00:00:00.000000000 Z
+date: 2013-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-event
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -25,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -39,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: wwtd
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -91,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: LogStash Logger for ruby