microphite 0.6.0 → 0.6.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjRkYTQwN2E1ZTM5ZWI3YTAxZmE4MTVjM2MxYWM0M2I0M2E2ODkzYw==
+    MDhjMTg3MTFjM2I1MGQzMjRmYmVmOTgzYzkwZmUxMjkxMDI3ZThkMA==
   data.tar.gz: !binary |-
-    MzNlYmU1OTk2YzZjNTgxYzdkNzQxM2M3Y2NhZTQ5MWJjNjhmMTc1Zg==
-!binary "U0hBNTEy":
+    MGE0MzFhNGE0MjMzMTQ1YThlNDVmYjM0M2NmNDg1ZjQwMzI3YWRlOQ==
+SHA512:
   metadata.gz: !binary |-
-    ODYzZjVmYjhkNzQ0ZWQ3ZjAwZmFkMzM4YjQzYjhlY2ViMGNkYWY3ZWY4ZTFk
-    Y2UyNmNhZDQ0YWZmNDc4MDY0MDViMzAxZWNhOTk2NGJkMGQ1NTBkZGQ0MmMz
-    NjE0Y2QxZTFjNGE3Y2I2ZGJlYzdkZmQxOThkYTBkYzBiM2VkZjk=
+    MWY4YzcyNDQ0MjZhOGMwYTlhYTY1NmY2YTFjMDRhOTE2OWQ2ZTE2ZDRlYWNj
+    YTNmY2Q1NzkwODgzMWIwMDhlMTQ3NGI2NWU5ZmM2YjAwNTM5MmI4NmViZTZm
+    OGIxMmQwZjFmOGE3NmY5NzRlNGExZGVlOTU1YmQyZDc1MjkzZjk=
   data.tar.gz: !binary |-
-    MWMyMDA1NDVmZTBmNjUyNTlkMjNkYjJiYTA2ZThjY2I1NDc2YjU5YzhkMjcx
-    MjkyZGJiYzk2OWVjOTJiNWQwOWE4M2E5NjRiMjQ1M2UzNjFiMDUxYjdmMDJk
-    MTA2MGY5Y2EyMTNiZGU1NGY0NGIyZjRjNWIxOTIwMTk3YTk0NTA=
+    NGIwM2M3YTNmMTAwOGViYTg3ZDk1NmJmMmUxMGUwNjljOTc2MWU4MDBjNjg3
+    MDI3NWYxNzg5NjFmMDAxODUyMzZhOWUxOWY3OWUzOTQwMjMzOTlmNDdkYzll
+    NWQ0YzdmMTU4Mzg0MDViNzRkNGY0OGFmNjAzZGQ0MzEwYjMwNmU=

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 Microphite CHANGELOG
 ====================
 
+v0.6.1
+------
+- Code cleanup/refactoring.  No functional changes.
+
 v0.6.0
 ------
 - Add execute-around support to write and gather methods

data/lib/microphite/client/base.rb

@@ -45,23 +45,11 @@ module Microphite
       end
 
       def write(metrics, &block)
-        if block_given?
-          result = block.call
-          push(@write_queue, metrics) if metrics.is_a? Hash
-          result
-        else
-          push(@write_queue, metrics) if metrics.is_a? Hash
-        end
+        push_around(@write_queue, metrics, &block)
       end
 
       def gather(metrics, &block)
-        if block_given?
-          result = block.call
-          push(@gather_queue, metrics) if metrics.is_a? Hash
-          result
-        else
-          push(@gather_queue, metrics) if metrics.is_a? Hash
-        end
+        push_around(@gather_queue, metrics, &block)
       end
 
       def prefix(prefix, &block)
@@ -136,48 +124,38 @@ module Microphite
       def worker_loop
         loop do
           wrap_errors do
-            @lock.synchronize do
-              if @write_queue.empty? and @gather_queue.empty?
-                case @status
-                  when :running
-                    wait_time = @next_flush - now
-                    if wait_time > 0
-                      @worker_event.wait(@lock, wait_time)
-                    end
-
-                  when :ending, :shutdown
-                    flush_accumulating
-                    wrap_errors do
-                      shutdown
-                    end
-                    @status = :shutdown
-                    @shutdown_event.broadcast
-                    Thread.exit
-
-                  else
-                    error(AssertionError.new("Invalid status: #{@status}"))
-                    Thread.exit
-                end
-              end
-            end
-
-            unwind(@write_queue).each { |m| write_metric m }
-            unwind(@gather_queue).each { |m| accumulate m }
+            event_wait
+            # Unwind and flush gather queue first, since the timestamps are
+            # created at flush.  This is more sensitive to delays and fudging
+            unwind(@gather_queue).each { |metric| accumulate metric }
             flush_accumulating if should_flush?
+
+            # Handle write queue last, since the timestamps are stored at the
+            # time write() is called
+            unwind(@write_queue).each { |metric| write_metric metric }
           end
         end
       end
 
+      def push_around(queue, metrics, &block)
+        if block_given?
+          result = block.call
+        else
+          result = nil
+        end
+        push(queue, metrics)
+        result
+      end
+
       def push(queue, metrics)
-        timestamp = now
-        cloned = metrics.clone
-        @lock.synchronize do
-          if queue.length <= @limit and @status == :running
-            queue.push [timestamp, cloned]
-            @worker_event.signal
-            true
-          else
-            false
+        if metrics.is_a? Hash
+          timestamp = now
+          cloned = metrics.clone
+          @lock.synchronize do
+            if queue.length <= @limit and @status == :running
+              queue.push [timestamp, cloned]
+              @worker_event.signal
+            end
           end
         end
       end
@@ -203,7 +181,9 @@ module Microphite
       end
 
       def flush_accumulating
-        @accumulating.each_pair { |k, v| write_metric(Metric.new(k, v, now)) }
+        # Capture timestamp first.  If write_metric fails, it might delay before retry
+        timestamp = now
+        @accumulating.each_pair { |k, v| write_metric(Metric.new(k, v, timestamp)) }
         @accumulating.clear
         @next_flush = now + @flush_interval
       end
@@ -211,6 +191,33 @@ module Microphite
       def should_flush?
         now > @next_flush
       end
+
+      def event_wait
+        @lock.synchronize do
+          if @write_queue.empty? and @gather_queue.empty?
+            case @status
+              when :running
+                wait_time = @next_flush - now
+                if wait_time > 0
+                  @worker_event.wait(@lock, wait_time)
+                end
+
+              when :ending, :shutdown
+                flush_accumulating
+                wrap_errors do
+                  shutdown
+                end
+                @status = :shutdown
+                @shutdown_event.broadcast
+                Thread.exit
+
+              else
+                error(AssertionError.new("Invalid status: #{@status}"))
+                Thread.exit
+            end
+          end
+        end
+      end
     end
   end
 end

data/lib/microphite/version.rb

@@ -1,3 +1,3 @@
 module Microphite
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: microphite
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - BZ
@@ -11,56 +11,50 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-22 00:00:00.000000000 Z
+date: 2013-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-  name: rake
-  type: :development
-  prerelease: false
+        version: '0'
 - !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-  name: rspec
-  type: :development
-  prerelease: false
+        version: '0'
 - !ruby/object:Gem::Dependency
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-  name: coveralls
-  type: :development
-  prerelease: false
+        version: '0'
 description: A tiny and fast, asynchronous graphite client
 email:
 - support@bz-technology.com
@@ -104,17 +98,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: A tiny and fast, asynchronous graphite client