pliny-librato 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d96c0fdc1c319b07e42ee4dc5eba2bad209a7726
-  data.tar.gz: 5b29955485124e99c6e5e0b8b6c8d40d1cd431e6
+  metadata.gz: 5dad320432446a53b261cac33b5fc636eeb492c8
+  data.tar.gz: 234d35819926bb0ddb1b27be431478d2b7f43a3a
 SHA512:
-  metadata.gz: ea01e6cfa6c5539e079550ac03262c308dafa5dc7700b3a7904cee6e97410f76e8869375795b9466fd17d2508158828ed2487b4529d367bdd28aafa2265d2036
-  data.tar.gz: 496100d0f6960734f8c32ae7803ed494c371c9a456c1bb1c9bb37d19da02c89bedb220319074f7fdfb65979457b5be333738030e519b133f226fb74120e93768
+  metadata.gz: fd225bebe9d5c1539da97b63072b33da4b1698946f4f75a4ac3dee9924951b957a23cd74185de160ad4abcb1d64d2f437cc58cc102076ed8d605a5f394c119b6
+  data.tar.gz: 4250c8362aa9d8e91e2aad1ba85f83193fe76453263baa3955942a7b0d83cf177918ea5f58f33489fa6aa68ef4f05bab7e473b1946ad71cf10bc9b4b1188c22e

data/CHANGELOG.md

@@ -4,6 +4,17 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## Unreleased
+
+## 0.5.1
+
+### Changed
+
+- The default submission interval is now 60 seconds for consistency with
+  l2met and this project's README.
+- Metrics are now regularly submitted on the desired interval. Previously,
+  a new metric would need to be queued after the interval expired.
+
 ## 0.5.0
 
 ### Added

data/README.md

@@ -43,15 +43,16 @@ Pliny::Metrics.measure(:bar) do
 end
 ```
 
-By default, it will send queued metrics every minute, or whenever the
-queue reaches 1000 metrics. These settings can be configured on initialization.
+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. It is the responsibility of the caller to trigger this.
+By default, any unsubmitted metrics on the queue will not be sent at shutdown. 
+It is the responsibility of the caller to trigger this.
 
 ```ruby
 # In the main process
-Signal.trap('TERM') do
+Kernel.on_exit do
   librato_backend.stop
 end
 

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

@@ -9,7 +9,7 @@ module Pliny
       class Backend
         POISON_PILL = :'❨╯°□°❩╯︵┻━┻'
 
-        def initialize(source: nil, interval: 10, count: 500)
+        def initialize(source: nil, interval: 60, count: 500)
           @source   = source
           @interval = interval
           @count    = count
@@ -24,61 +24,66 @@ module Pliny
         end
 
         def start
-          start_thread
+          start_counter
+          start_timer
           self
         end
 
         def stop
           metrics_queue.push(POISON_PILL)
-          thread.join
+          timer.terminate
+          counter.join
+          flush_librato
         end
 
         private
 
-        attr_reader :source, :interval, :count, :thread
+        attr_reader :source, :interval, :count, :timer, :counter
 
-        def start_thread
-          @thread = Thread.new do
+        def start_timer
+          @timer = Thread.new do
             loop do
-              msg = metrics_queue.pop
-              break unless process(msg)
+              sleep interval
+              flush_librato
             end
           end
         end
 
-        def process(msg)
-          if msg == POISON_PILL
-            flush_librato
-            false
-          else
-            enqueue_librato(msg)
-            true
+        def start_counter
+          @counter = Thread.new do
+            loop do
+              msg = metrics_queue.pop
+              msg == POISON_PILL ? break : enqueue_librato(msg)
+            end
           end
         end
 
         def enqueue_librato(msg)
-          with_error_report { librato_queue.add(msg) }
+          sync { librato_queue.add(msg) }
         end
 
         def flush_librato
-          with_error_report { librato_queue.submit }
+          sync { librato_queue.submit }
         end
 
-        def with_error_report
-          yield
+        def sync(&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_interval: interval,
-            autosubmit_count:    count
+            source:           source,
+            autosubmit_count: count
           )
         end
       end

data/lib/pliny/librato/version.rb

@@ -1,5 +1,5 @@
 module Pliny
   module Librato
-    VERSION = "0.5.0"
+    VERSION = '0.5.1'
   end
 end

metadata

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