logstash_rails 0.0.13 → 0.0.14

data/.tailor

@@ -0,0 +1,25 @@
+Tailor.config do |config|
+  config.formatters "text"
+  config.file_set './**/*.rb' do |style|
+    style.allow_camel_case_methods false, level: :error
+    style.allow_hard_tabs false, level: :error
+    style.allow_screaming_snake_case_classes false, level: :error
+    style.allow_trailing_line_spaces false, level: :error
+    style.allow_invalid_ruby false, level: :warn
+    style.indentation_spaces 2, level: :error
+    style.max_code_lines_in_class 300, level: :error
+    style.max_code_lines_in_method 30, level: :error
+    style.max_line_length 80, level: :error
+    style.spaces_after_comma 1, level: :error
+    style.spaces_after_lbrace 1, level: :error
+    style.spaces_after_lbracket 0, level: :error
+    style.spaces_after_lparen 0, level: :error
+    style.spaces_before_comma 0, level: :error
+    style.spaces_before_lbrace 1, level: :error
+    style.spaces_before_rbrace 1, level: :error
+    style.spaces_before_rbracket 0, level: :error
+    style.spaces_before_rparen 0, level: :error
+    style.spaces_in_empty_braces 0, level: :error
+    style.trailing_newlines 1, level: :error
+  end
+end

data/Gemfile

@@ -8,6 +8,7 @@ group :development do
   gem 'yard'
   gem 'rake'
   gem 'redcarpet'
+  gem 'tailor'
 end
 
 group :test do

data/README.md

@@ -81,7 +81,7 @@ The most basic configuration looks like:
 LogstashRails.config(transport: :redis)
 ```
 
-This will will connect to a redis server on _localhost:6379_, use _logstash_ as
+This will connect to a redis server on _localhost:6379_, use _logstash_ as
 key for the redis list to push to and subscribe to _all events_.
 
 A more complete example looks like:
@@ -108,8 +108,8 @@ This will only subscribe to events from `ActionController`.
 3. Commit your changes (`git commit -am "Added ..."`)
 4. Push to the branch (`git push origin my_feature`)
 5. Open a Pull Request
-6. Enjoy a refreshing Diet Coke and wait
+6. Enjoy a refreshing Orangina and wait
 
 ## License
 
-Licensed under the General Public License version 3 (GPLv3). See [LICENSE.txt](/LICENSE.txt) for details.
+Licensed under the GNU General Public License version 3 (GPLv3). See [LICENSE.txt](/LICENSE.txt) for details.

data/Rakefile

@@ -1,6 +1,7 @@
 require 'bundler/gem_tasks'
 require 'yard'
 require 'rspec/core/rake_task'
+require 'tailor/rake_task'
 
 RSpec::Core::RakeTask.new(:test)
 
@@ -16,3 +17,5 @@ end
 task :default do
   system "rake -T"
 end
+
+Tailor::RakeTask.new

data/lib/logstash_rails/transport/redis.rb

@@ -22,8 +22,13 @@ module LogstashRails
       end
 
       def push(json_event)
-        unless @redis.rpush(@redis_key, json_event)
-          raise "could not send event to redis"
+        begin
+          unless @redis.rpush(@redis_key, json_event)
+            raise "could not send event to redis"
+          end
+        rescue ::Redis::InheritedError
+          @redis.client.connect
+          retry
         end
       end
 

data/lib/logstash_rails/transport_base.rb

@@ -7,6 +7,7 @@ module LogstashRails
     def initialize(options)
       @events = options[:events] || [/.*/]
       @error_logger = options[:logger]
+      @raise_errors = options[:raise_errors] || false
 
       if defined?(Rails)
         @error_logger ||= Rails.logger
@@ -41,6 +42,7 @@ module LogstashRails
       begin
         push(json_event)
       rescue
+        raise $! if @raise_errors
         log($!)
       end
     end

data/lib/logstash_rails/version.rb

@@ -1,3 +1,3 @@
 module LogstashRails
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end

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

@@ -4,10 +4,6 @@ describe LogstashRails::Transport::Logfile do
     Tempfile.new(__FILE__)
   end
 
-  after do
-    logfile.unlink
-  end
-
   subject do
     LogstashRails::Transport::Logfile.new(logfile: logfile)
   end

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

@@ -1,7 +1,27 @@
 describe LogstashRails::Transport::LogstashUdp do
+
   subject do
-    LogstashRails::Transport::LogstashUdp.new
+    LogstashRails::Transport::LogstashUdp.new(port: 9001)
   end
 
   it { should respond_to :push }
+
+  it 'sends data over udp' do
+    message = "toto"
+    socket = UDPSocket.new
+    socket.bind('127.0.0.1', 9001)
+
+    received = nil
+    thread = Thread.new do
+      received = socket.recvfrom(message.length).first
+    end
+
+    subject.push message
+
+    thread.join
+    socket.close
+
+    received.should eq message
+  end
+
 end

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

@@ -7,7 +7,8 @@ describe LogstashRails::Transport::Redis do
   subject do
     LogstashRails::Transport::Redis.new(
       redis:      Redis.new,
-      redis_key: 'logstash'
+      redis_key: 'logstash',
+      raise_errors: true
     )
   end
 
@@ -19,4 +20,31 @@ describe LogstashRails::Transport::Redis do
     Redis.new.lpop('logstash').should eq 'foobar_event'
   end
 
+  it 'survives forking' do
+    r,w = IO.pipe
+
+    # use connection in parent process
+    subject.push 'foo'
+    Redis.new.lpop 'logstash'
+
+    if fork
+      w.close
+
+      r.read.should eq 'true'
+
+      Process.wait
+    else
+
+      # use connection in child process
+      subject.push 'bar'
+
+      w.write(Redis.new.lpop('logstash') == 'bar')
+      w.flush
+
+      SimpleCov.at_exit{}
+      Process.exit! true
+    end
+
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash_rails
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-15 00:00:00.000000000 Z
+date: 2013-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-event
@@ -68,6 +68,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .tailor
 - .travis.yml
 - Gemfile
 - LICENSE.txt
@@ -105,7 +106,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1388131657381094432
+      hash: 3553073864180370669
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -114,10 +115,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1388131657381094432
+      hash: 3553073864180370669
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Send events from Rails to Logstash without logger foo.