logstash-logger 0.1.0 → 0.2.0

data/.gitignore

@@ -15,4 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
-localhost
+

data/lib/logstash-logger/logger.rb

@@ -6,8 +6,7 @@ class LogStashLogger < ::Logger
   HOST = Socket.gethostname
   
   def initialize(host, port)
-    @client = ::LogStashLogger::TCPClient.new(host, port)
-    super
+    super(::LogStashLogger::TCPClient.new(host, port))
   end
   
   def add(severity, message = nil, progname = nil, &block)
@@ -24,7 +23,7 @@ class LogStashLogger < ::Logger
         progname = @progname
       end
     end
-    @client.write(
+    @logdev.write(
       format_message(format_severity(severity), Time.now, progname, message))
     true
   end

data/lib/logstash-logger/tcp_client.rb

@@ -2,6 +2,7 @@ class LogStashLogger::TCPClient
   def initialize(host, port)
     @host = host
     @port = port
+    @socket = nil
   end
   
   def write(event)
@@ -11,11 +12,17 @@ class LogStashLogger::TCPClient
       @socket.write("#{event.to_hash.to_json}\n")
     rescue => e
       warn "LogStashLogger::TCPClient - #{e.class} - #{e.message}"
-      @socket && @socket.close rescue nil
+      close
       @socket = nil
     end
   end
   
+  def close
+    @socket && @socket.close
+  rescue => e
+    warn "LogStashLogger::TCPClient - #{e.class} - #{e.message}"
+  end
+  
   private
   def connect
     @socket = TCPSocket.new(@host, @port)

data/lib/logstash-logger/version.rb

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

data/spec/logger_spec.rb

@@ -16,11 +16,20 @@ describe LogStashLogger do
     event['severity'] = 'INFO'
     event
   end
+  
+  def logdev
+    subject.instance_variable_get(:@logdev)
+  end
+  
+  it 'should use TCPClient as the log device' do
+    logdev.should be_a Logger::LogDevice
+    logdev.instance_variable_get(:@dev).should be_a LogStashLogger::TCPClient
+  end
 
   it 'should take a string message and write a logstash event' do
     message = 'test'
   
-    subject.client.should_receive(:write) do |event|
+    logdev.should_receive(:write) do |event|
       event.should be_a LogStash::Event
       event.source.should eql(host)
       event.message.should eql(message)
@@ -31,7 +40,7 @@ describe LogStashLogger do
   end
   
   it 'should take a logstash-formatted json string and write out a logstash event' do
-    subject.client.should_receive(:write) do |event|
+    logdev.should_receive(:write) do |event|
       event.should be_a LogStash::Event
       event.message.should eql(logstash_event.message)
       event.source.should eql(host)
@@ -41,7 +50,7 @@ describe LogStashLogger do
   end
   
   it 'should take a LogStash::Event and write it out' do
-    subject.client.should_receive(:write) do |event|
+    logdev.should_receive(:write) do |event|
       event.should be_a LogStash::Event
       event.message.should eql(logstash_event.message)
       event['severity'].should eql(logstash_event['severity'])
@@ -58,7 +67,7 @@ describe LogStashLogger do
       'severity' => 'INFO'
     }
     
-    subject.client.should_receive(:write) do |event|
+    logdev.should_receive(:write) do |event|
       event.should be_a LogStash::Event
       event.message.should eql('test')
       event['severity'].should eql('INFO')

metadata

@@ -1,74 +1,71 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: logstash-logger
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 0.2.0
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 0
-  version: 0.1.0
 platform: ruby
-authors: 
+authors:
 - David Butler
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-12-15 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-12-26 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: logstash-event
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby logger that writes directly to LogStash
-email: 
+email:
 - dwbutler@ucla.edu
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -84,37 +81,28 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/dwbutler/logstash-logger
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: LogStash Logger for ruby
-test_files: 
+test_files:
 - spec/logger_spec.rb
 - spec/spec_helper.rb