logstash-logger 0.19.1 → 0.19.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5e73bdbf504d36b2e6266e91dae7d1a5a033eeb
-  data.tar.gz: 802ab34d3ab9d161deac72e7c7596b6d88b9c168
+  metadata.gz: 39bb1c811b357832fdd87f4f5c912244b4906d85
+  data.tar.gz: ac31561fa06f8e6eda9008f954596919771f1d1d
 SHA512:
-  metadata.gz: cd059ec8dfde28adbc1e1107008c7d7bbb4832d1679ccda6e92d182d891e845a76c889451c017da3c1fdfb33b26a0a7d68a91a1c3b0fddd751abff33c65bb1f0
-  data.tar.gz: 8f00d41ed68d4950a3d760a1acae66fe3a05dfcebd67efa0ab96cacce97d9c884cd489c407116e3daa6225ff3fb65bf747a14bd182bb09ad8ddcfa554a962cb5
+  metadata.gz: 86f24b4b12939ea038c60994dd6a278b03e59a5226bbb80587e667d79f78cc21c7c8819328b2eaecafe7b9651415fa4d0ebbc1dab75b464fc0f9534719fc129d
+  data.tar.gz: a696a3440c71cc46c49bdfe9c00e4f2b66135c348bfe50c1161cb4fb9e2b7dcb6e0794f3490955494e10032cdbb5e6b5542881318d013d9b197f695a49febfd7

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.19.2
+
+- Fixes mutex and memory leak issues when resetting buffer.
+[#97](https://github.com/dwbutler/logstash-logger/issues/97)
+[#98](https://github.com/dwbutler/logstash-logger/issues/98)
+[#99](https://github.com/dwbutler/logstash-logger/issues/99)
+
 ## 0.19.1
 
 - Fixes compatibility with `ActiveRecord::SessionStore`. [#96](https://github.com/dwbutler/logstash-logger/pull/96)

data/lib/logstash-logger/buffer.rb

@@ -113,28 +113,21 @@ module LogStashLogger
         :pending_count => 0,
 
         # guard access to pending_items & pending_count
-        :pending_mutex => Mutex.new,
+        :pending_mutex => pending_mutex,
 
         # items which are currently being flushed
         :outgoing_items => {},
         :outgoing_count => 0,
 
         # ensure only 1 flush is operating at once
-        :flush_mutex => Mutex.new,
+        :flush_mutex =>    flush_mutex,
 
         # data for timed flushes
-        :last_flush => Time.now,
-        :timer => Thread.new do
-          loop do
-            sleep(@buffer_config[:max_interval])
-            begin
-              buffer_flush(:force => true)
-            rescue
-            end
-          end
-        end
+        :last_flush =>     Time.now,
+        :timer =>          flush_timer_thread
       }
 
+
       # events we've accumulated
       buffer_clear_pending
     end
@@ -284,6 +277,28 @@ module LogStashLogger
     end
 
     private
+
+    def pending_mutex
+      @pending_mutex ||= Mutex.new
+    end
+
+    def flush_mutex
+      @flush_mutex ||= Mutex.new
+    end
+
+    def flush_timer_thread
+      @flush_timer_thread ||=
+        Thread.new do
+          loop do
+            sleep(@buffer_config[:max_interval])
+            begin
+              buffer_flush(:force => true)
+            rescue
+            end
+          end
+        end
+    end
+
     def buffer_clear_pending
       @buffer_state[:pending_items] = Hash.new { |h, k| h[k] = [] }
       @buffer_state[:pending_count] = 0

data/lib/logstash-logger/version.rb

@@ -1,3 +1,3 @@
 module LogStashLogger
-  VERSION = "0.19.1"
+  VERSION = "0.19.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-logger
 version: !ruby/object:Gem::Version
-  version: 0.19.1
+  version: 0.19.2
 platform: ruby
 authors:
 - David Butler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-27 00:00:00.000000000 Z
+date: 2016-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-event