logstash_rails 0.0.15 → 0.0.16

data/lib/logstash_rails/transport/logstash_tcp.rb

@@ -1,18 +1,23 @@
+require 'celluloid/io'
+require 'celluloid/io'
+
 module LogstashRails
   module Transport
     class LogstashTcp < TransportBase
 
       def initialize(options)
-        host = options[:host] || 'localhost'
-        port = options.fetch(:port)
-
-        @socket = TCPSocket.new(host, port)
+        @host = options[:host] || 'localhost'
+        @port = options.fetch(:port)
 
         super
       end
 
       def push(json_event)
         @socket.write(json_event)
+      rescue Errno::EPIPE, Errno::ECONNREFUSED, NoMethodError => e
+        log(e)
+        connect!
+        retry
       end
 
       def destroy
@@ -20,6 +25,12 @@ module LogstashRails
         @socket.close
       end
 
+      private
+
+      def connect!
+        @socket = Celluloid::IO::TCPSocket.new(@host, @port)
+      end
+
     end
   end
 end

data/lib/logstash_rails/version.rb

@@ -1,3 +1,3 @@
 module LogstashRails
-  VERSION = "0.0.15"
+  VERSION = "0.0.16"
 end

data/logstash_rails.gemspec

@@ -16,7 +16,8 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^spec/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency('logstash-event')
+  gem.add_dependency('logstash-event', '~> 1.2.02')
   gem.add_dependency('activesupport')
   gem.add_dependency('redis')
+  gem.add_dependency('celluloid-io')
 end

data/spec/lib/logstash_rails/formatter_spec.rb

@@ -11,7 +11,7 @@ describe 'generated logstash event' do
   end
 
   it 'has the event type as message' do
-    JSON.parse(Redis.new.lpop('logstash'))['@message'].should eq "process_action.action_controller"
+    JSON.parse(Redis.new.lpop('logstash'))['message'].should eq "process_action.action_controller"
   end
 
 end

data/spec/lib/logstash_rails/transport/logstash_tcp_spec.rb

@@ -23,6 +23,9 @@ describe LogstashRails::Transport::LogstashTcp do
   end
 
   it 'should close the tcp socket' do
+    # initialize tcp socket
+    logstash_tcp.push 'toto'
+
     socket = logstash_tcp.instance_variable_get(:@socket)
     expect{ logstash_tcp.destroy }.to change{ socket.closed? }.from(false).to(true)
   end
@@ -33,4 +36,11 @@ describe LogstashRails::Transport::LogstashTcp do
     @thread.join
     @received.should eq 'toto'
   end
+
+  it 'lazily connects the socket' do
+    expect{ logstash_tcp.push 'toto' }.to change{
+      logstash_tcp.instance_variable_get(:@socket).class
+    }
+  end
+
 end

data/spec/lib/logstash_rails/transport/redis_spec.rb

@@ -27,24 +27,23 @@ describe LogstashRails::Transport::Redis do
     subject.push 'foo'
     Redis.new.lpop 'logstash'
 
-    if fork
-      w.close
-
-      r.read.should eq 'true'
-
-      Process.wait
-    else
-
+    fork do
       # use connection in child process
       subject.push 'bar'
 
       w.write(Redis.new.lpop('logstash') == 'bar')
       w.flush
 
+      # override exit hooks
       SimpleCov.at_exit{}
       Process.exit! true
     end
 
+    w.close
+
+    r.read.should eq 'true'
+
+    Process.wait
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash_rails
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
   prerelease: 
 platform: ruby
 authors:
@@ -9,10 +9,26 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-25 00:00:00.000000000 Z
+date: 2013-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-event
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.02
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.02
+- !ruby/object:Gem::Dependency
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -28,7 +44,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: redis
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -44,7 +60,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: redis
+  name: celluloid-io
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -106,7 +122,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -706891558612053721
+      hash: 4605437770903519809
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -115,10 +131,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -706891558612053721
+      hash: 4605437770903519809
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Send events from Rails to Logstash without logger foo.