md-logstasher 1.0.5 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4563d96cf88d8a5e5fa8c1a263ed5e79c2fa2acc
-  data.tar.gz: edbcb27c41a3068d29fb1d896131a81035391c3d
+  metadata.gz: caa8c203cdf135bf92e27bfca4064949758143c3
+  data.tar.gz: 98ee851c3e42f83a2c4da5826affa3a1fc1c5ad2
 SHA512:
-  metadata.gz: f2bcdf71a918cbed00947a631abbd3a444dee9918afd8eb3d1947e4f092fc8569327ee088bb5aa890d5900fc959879dc3e9da3fcac96d675d36a6ea2db66e08f
-  data.tar.gz: 77f0394fb5e701c380176ae702412d07c8b24faa31d6f67ec60969ad3e5f42499c763bcd4e6d78efbb19ba1750750619d074e9e4e011e65d306b1d50a231c3cc
+  metadata.gz: fbcabec619855beaf57346e6ecd42b41ae8ba487ece014e7c34b047bc83c8b12efeb6d0a1e116ae427b407d6d0f59aef40067b1e0b0d3e5a38c47685b7a2ca12
+  data.tar.gz: 8830d3f59e199d1c31d8226755093b9dfcefb8401d38c9058d0bac828274785e21c81030a5f3a691362d8afd301fc24534b111efec901d71835fa031a135a4d3

data/lib/logstasher/device/redis.rb

@@ -59,7 +59,7 @@ module LogStasher
 
       def validate_options
         unless ['list', 'channel'].include?(options['data_type'])
-          fail 'Expected data_type to be either "list" or "channel"'
+          fail RuntimeError, 'Expected data_type to be either "list" or "channel"'
         end
       end
     end

data/lib/logstasher/device/syslog.rb

@@ -2,34 +2,27 @@
 
 require 'logstasher/device'
 require 'syslog'
-require 'thread'
 
 module LogStasher
   module Device
     class Syslog
       include ::LogStasher::Device
 
-      SEMAPHORE = Mutex.new
-
       attr_reader :options
 
       def initialize(options = {})
         raw_options = default_options.merge(stringify_keys(options))
 
         @options = parse_options(raw_options)
-        @closed  = false
+        open_syslog
       end
 
       def close
-        SEMAPHORE.synchronize do
-          ::Syslog.close if ::Syslog.opened?
-        end
-
-        @closed = true
+        ::Syslog.close rescue nil
       end
 
       def closed?
-        @closed
+        !::Syslog.opened?
       end
 
       def facility
@@ -49,11 +42,10 @@ module LogStasher
       end
 
       def write(log)
-        fail ::RuntimeError, 'Cannot write. The device has been closed.' if closed?
+        fail ::RuntimeError, 'Syslog has been closed.' if closed?
+        fail ::RuntimeError, 'Syslog re-configured unexpectedly.' if syslog_config_changed?
 
-        with_syslog_open do
-          ::Syslog.log(priority, '%s', log)
-        end
+        ::Syslog.log(priority, '%s', log)
       end
 
       private
@@ -63,10 +55,18 @@ module LogStasher
           'identity' => 'logstasher',
           'facility' => ::Syslog::LOG_LOCAL0,
           'priority' => ::Syslog::LOG_INFO,
-          'flags'    => ::Syslog::LOG_PID | ::Syslog::LOG_CONS
+          'flags'    => ::Syslog::LOG_PID | ::Syslog::LOG_CONS,
         }
       end
 
+      def open_syslog
+        if ::Syslog.opened?
+          ::Syslog.reopen(identity, flags, facility)
+        else
+          ::Syslog.open(identity, flags, facility)
+        end
+      end
+
       def parse_option(value)
         case value
         when ::String
@@ -85,20 +85,8 @@ module LogStasher
         options
       end
 
-      def syslog_configured?
-        ::Syslog.ident == identity && ::Syslog.options == flags && ::Syslog.facility == facility
-      end
-
-      def with_syslog_open
-        SEMAPHORE.synchronize do
-          if ::Syslog.opened?
-            ::Syslog.reopen(identity, flags, facility) unless syslog_configured?
-          else
-            ::Syslog.open(identity, flags, facility)
-          end
-
-          yield
-        end
+      def syslog_config_changed?
+        ::Syslog.ident != identity || ::Syslog.options != flags || ::Syslog.facility != facility
       end
     end
   end

data/lib/logstasher/version.rb

@@ -1,3 +1,3 @@
 module LogStasher
-  VERSION = "1.0.5"
+  VERSION = "1.1.0"
 end

data/spec/lib/logstasher/device/redis_spec.rb

@@ -40,7 +40,7 @@ describe LogStasher::Device::Redis do
   it 'does not allow unsupported data types' do
     expect {
       device = LogStasher::Device::Redis.new(data_type: 'blargh')
-    }.to raise_error()
+    }.to raise_error(::RuntimeError)
   end
 
   it 'quits the redis connection on #close' do

data/spec/lib/logstasher/device/syslog_spec.rb

@@ -14,9 +14,9 @@ describe LogStasher::Device::Syslog do
   before { allow(::Syslog).to receive(:log) }
 
   around do |example|
-    ::Syslog.close if ::Syslog.opened?
+    ::Syslog.close rescue nil
     example.run
-    ::Syslog.close if ::Syslog.opened?
+    ::Syslog.close rescue nil
   end
 
   it 'has default options' do
@@ -64,25 +64,37 @@ describe LogStasher::Device::Syslog do
     expect(device.flags).to eq(::Syslog::LOG_NOWAIT | ::Syslog::LOG_ODELAY)
   end
 
-  describe '#write' do
-    subject { LogStasher::Device::Syslog.new }
+  it 'opens syslog when it is closed' do
+    expect(::Syslog).to receive(:open).with(
+      default_options['identity'],
+      default_options['flags'],
+      default_options['facility'],
+    )
 
-    it 'opens syslog when syslog is closed' do
-      expect(::Syslog).to receive(:open).with(subject.identity, subject.flags, subject.facility)
-      subject.write('a log')
-    end
+    LogStasher::Device::Syslog.new
+  end
 
-    it 'does not re-open syslog when its config is in sync' do
-      ::Syslog.open(subject.identity, subject.flags, subject.facility)
-      expect(::Syslog).not_to receive(:open)
-      expect(::Syslog).not_to receive(:reopen)
-      subject.write('a log')
-    end
+  it 're-opens syslog when it is already opened' do
+    ::Syslog.open('temp', ::Syslog::LOG_NDELAY, ::Syslog::LOG_AUTH)
 
-    it 're-opens syslog when its config is out of sync' do
-      ::Syslog.open('temp', ::Syslog::LOG_NDELAY, ::Syslog::LOG_AUTH)
-      expect(::Syslog).to receive(:reopen).with(subject.identity, subject.flags, subject.facility)
-      subject.write('a log')
+    expect(::Syslog).to receive(:reopen).with(
+      default_options['identity'],
+      default_options['flags'],
+      default_options['facility'],
+    )
+
+    LogStasher::Device::Syslog.new
+  end
+
+  describe '#write' do
+    subject { LogStasher::Device::Syslog.new }
+
+    it 'fails when the syslog config is out of sync' do
+      subject
+      ::Syslog.reopen('temp', ::Syslog::LOG_NDELAY, ::Syslog::LOG_AUTH)
+      expect {
+        subject.write('a log')
+      }.to raise_error(::RuntimeError, 'Syslog re-configured unexpectedly.')
     end
 
     it 'writes the log to syslog' do
@@ -94,7 +106,7 @@ describe LogStasher::Device::Syslog do
       subject.close
       expect {
         subject.write('a log')
-      }.to raise_error(::RuntimeError, 'Cannot write. The device has been closed.')
+      }.to raise_error(::RuntimeError, 'Syslog has been closed.')
     end
   end
 
@@ -106,15 +118,9 @@ describe LogStasher::Device::Syslog do
       expect(subject).to be_closed
     end
 
-    it 'closes syslog when syslog is open' do
-      ::Syslog.open(subject.identity, subject.flags, subject.facility)
+    it 'closes syslog' do
       expect(::Syslog).to receive(:close)
       subject.close
     end
-
-    it 'does not close syslog if it is already closed' do
-      expect(::Syslog).not_to receive(:close)
-      subject.close
-    end
   end
 end

data/spec/lib/logstasher/railtie_spec.rb

@@ -19,12 +19,6 @@ describe ::LogStasher::Railtie do
   let(:config) { described_class.config.logstasher }
 
   describe 'logstasher.configure' do
-    subject do
-      described_class.instance.initializers.find do |initializer|
-        initializer.name == 'logstasher.configure'
-      end
-    end
-
     it 'should configure LogStasher' do
       config.logger                   = ::Logger.new('/dev/null')
       config.log_level                = "log_level"
@@ -40,7 +34,7 @@ describe ::LogStasher::Railtie do
       expect(::LogStasher).to receive(:logger=).with(config.logger).and_call_original
       expect(config.logger).to receive(:level=).with("log_level")
 
-      subject.run
+      ActiveSupport.run_load_hooks(:before_initialize)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: md-logstasher
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.0
 platform: ruby
 authors:
 - Devin Christensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-12 00:00:00.000000000 Z
+date: 2016-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-event
@@ -121,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Awesome rails logs