pliny-librato 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5dad320432446a53b261cac33b5fc636eeb492c8
-  data.tar.gz: 234d35819926bb0ddb1b27be431478d2b7f43a3a
+  metadata.gz: f64355e55742cd9a4eade6f2620a6fb64ad2e0eb
+  data.tar.gz: b1bb8a0c6a7809bb88c62750f108553c87548056
 SHA512:
-  metadata.gz: fd225bebe9d5c1539da97b63072b33da4b1698946f4f75a4ac3dee9924951b957a23cd74185de160ad4abcb1d64d2f437cc58cc102076ed8d605a5f394c119b6
-  data.tar.gz: 4250c8362aa9d8e91e2aad1ba85f83193fe76453263baa3955942a7b0d83cf177918ea5f58f33489fa6aa68ef4f05bab7e473b1946ad71cf10bc9b4b1188c22e
+  metadata.gz: d9f1e300b6f5defdd99af9b4ba57ad5a1773543d18f018ca639b68533efe68cec2e2d0d2d78f2e7a70c8e3a5ea184e6a4fb6ce2128e687b1cac727c41536674f
+  data.tar.gz: aa4c903d27c9da3ee019096e1a5f0c65114babf6785835164bc1413b9d9a47ab5ccf1e5bc9b7e8f1913039f48629af6080404fb20e5c40c755f577a1f1a3e728

data/CHANGELOG.md

@@ -6,6 +6,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
 
+## 0.5.2
+
+### Fixed
+
+- Removed potential deadlock when stopping the backend.
+
+### Changed
+
+- `Backend#stop` can no longer be called from within a `Signal.trap` block.
+
 ## 0.5.1
 
 ### Changed

data/README.md

@@ -47,12 +47,14 @@ By default, it will send queued metrics every minute, and anytime the
 queue reaches 500 metrics. These settings can be configured on initialization.
 
 ## Shutdown
-By default, any unsubmitted metrics on the queue will not be sent at shutdown. 
+By default, any unsubmitted metrics on the queue will not be sent at shutdown.
 It is the responsibility of the caller to trigger this.
 
+**Note**: `#stop` will not work with signal traps, as mutexes can't be obtained within traps.
+
 ```ruby
 # In the main process
-Kernel.on_exit do
+Kernel.at_exit do
   librato_backend.stop
 end
 

data/lib/pliny/librato/metrics/backend.rb

@@ -10,9 +10,13 @@ module Pliny
         POISON_PILL = :'❨╯°□°❩╯︵┻━┻'
 
         def initialize(source: nil, interval: 60, count: 500)
-          @source   = source
-          @interval = interval
-          @count    = count
+          @interval      = interval
+          @mutex         = Mutex.new
+          @metrics_queue = Queue.new
+          @librato_queue = ::Librato::Metrics::Queue.new(
+            source:           source,
+            autosubmit_count: count
+          )
         end
 
         def report_counts(counts)
@@ -31,14 +35,15 @@ module Pliny
 
         def stop
           metrics_queue.push(POISON_PILL)
-          timer.terminate
+          # Ensure timer is not running when we terminate it
+          sync { timer.terminate }
           counter.join
           flush_librato
         end
 
         private
 
-        attr_reader :source, :interval, :count, :timer, :counter
+        attr_reader :interval, :timer, :counter, :metrics_queue, :librato_queue
 
         def start_timer
           @timer = Thread.new do
@@ -67,25 +72,10 @@ module Pliny
         end
 
         def sync(&block)
-          mutex.synchronize(&block)
+          @mutex.synchronize(&block)
         rescue => error
           Pliny::ErrorReporters.notify(error)
         end
-
-        def mutex
-          @mutex ||= Mutex.new
-        end
-
-        def metrics_queue
-          @metrics_queue ||= Queue.new
-        end
-
-        def librato_queue
-          @librato_queue ||= ::Librato::Metrics::Queue.new(
-            source:           source,
-            autosubmit_count: count
-          )
-        end
       end
     end
   end

data/lib/pliny/librato/version.rb

@@ -1,5 +1,5 @@
 module Pliny
   module Librato
-    VERSION = '0.5.1'
+    VERSION = '0.5.2'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pliny-librato
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Andrew Appleton
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-12 00:00:00.000000000 Z
+date: 2017-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: librato-metrics