influxdb 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e708cfd29b32a5d60b415ae05c17d60e1d003b8
-  data.tar.gz: bd843bc59f21981ab448b682129a478276e01a83
+  metadata.gz: 3cfda4b23fa6e69256f6309aa37b2b84b4b00fe9
+  data.tar.gz: d9ca155910d5323850f3dc11f76a20f6d4520747
 SHA512:
-  metadata.gz: 559ccfca33fc274337448ea27c9ac082d9f0f0d45b12b3c37cb934ebfa44539966d109d54bb28e20ce9fc28ccb71744fdc017a8061a36aa04308c454695c8594
-  data.tar.gz: 69ad1c57c5d07a8ce36e8efee843d8c68230bf5a6f5c74c1136b343bcafd776cfad28815d2e4acb2034aa731a2ec0d1c652edc86db242a1f9d98a12080e6c16b
+  metadata.gz: 755051222fdd660fbc2b0b43bd6e3b07e153fe81193b9152f0b03e2eeedb6bccdcac0aeb67ec10b824efc0446597b9c2629fbb0117ca27739af12d35f1ff4466
+  data.tar.gz: 764110f71894216a9032505fc2bdd8f0ad5580fce387a8b420a3d0eff01b16ab86b8525543c5d42793ebc090e090ac1281d42d70b7d264693a8ac4ed64fd2560

data/Rakefile

@@ -16,3 +16,11 @@ RSpec.configure do |config|
 end
 
 task :default => :spec
+
+task :console do
+  require 'irb'
+  require 'irb/completion'
+  require 'influxdb'
+  ARGV.clear
+  IRB.start
+end

data/lib/influxdb/client.rb

@@ -53,6 +53,8 @@ module InfluxDB
       @read_timeout = opts[:read_timeout] || 300
       @async = opts[:async] || false
 
+      @worker = InfluxDB::Worker.new(self) if @async
+
       unless @hosts.is_a? Array
         @hosts = [@hosts]
       end
@@ -138,8 +140,7 @@ module InfluxDB
       end
 
       if async
-        @worker = InfluxDB::Worker.new(self) if @worker.nil?
-        @worker.queue.push(payload)
+        worker.push(payload)
       else
         _write([payload], time_precision)
       end
@@ -226,7 +227,8 @@ module InfluxDB
         http.read_timeout = @read_timeout
         http.use_ssl = @use_ssl
         block.call(http)
-      rescue StandardError => e
+
+      rescue Timeout::Error, *InfluxDB::NET_HTTP_EXCEPTIONS => e
         log :error, "Failed to contact host #{host}: #{e.inspect} - retrying in #{delay}s."
         log :info, "Queue size is #{@queue.length}." unless @queue.nil?
 
@@ -249,5 +251,15 @@ module InfluxDB
         Hash[columns.zip(decoded_point)]
       end
     end
+
+    WORKER_MUTEX = Mutex.new
+    def worker
+      return @worker if @worker
+      WORKER_MUTEX.synchronize do
+        #this return is necessary because the previous mutex holder might have already assigned the @worker
+        return @worker if @worker
+        @worker = InfluxDB::Worker.new(self)
+      end
+    end
   end
 end

data/lib/influxdb/errors.rb

@@ -1,5 +1,8 @@
+require "net/http"
+require "zlib"
+
 module InfluxDB
-  class Error < Exception
+  class Error < StandardError
   end
 
   class AuthenticationError < Error
@@ -10,4 +13,22 @@ module InfluxDB
 
   class JSONParserError < Error
   end
+
+  # Taken from: https://github.com/lostisland/faraday/blob/master/lib/faraday/adapter/net_http.rb
+  NET_HTTP_EXCEPTIONS = [
+    EOFError,
+    Errno::ECONNABORTED,
+    Errno::ECONNREFUSED,
+    Errno::ECONNRESET,
+    Errno::EHOSTUNREACH,
+    Errno::EINVAL,
+    Errno::ENETUNREACH,
+    Net::HTTPBadResponse,
+    Net::HTTPHeaderSyntaxError,
+    Net::ProtocolError,
+    SocketError,
+    Zlib::GzipFile::Error,
+  ]
+
+  NET_HTTP_EXCEPTIONS << OpenSSL::SSL::SSLError if defined?(OpenSSL)
 end

data/lib/influxdb/version.rb

@@ -1,3 +1,3 @@
 module InfluxDB
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/influxdb/worker.rb

@@ -27,6 +27,10 @@ module InfluxDB
       Thread.list.count {|t| t[:influxdb] == self.object_id}
     end
 
+    def push(payload)
+      queue.push(payload)
+    end
+
     def spawn_threads!
       NUM_WORKER_THREADS.times do |thread_num|
         log :debug, "Spawning background worker thread #{thread_num}."
@@ -41,7 +45,7 @@ module InfluxDB
 
           while true
             self.check_background_queue(thread_num)
-            sleep SLEEP_INTERVAL
+            sleep rand(SLEEP_INTERVAL)
           end
         end
       end

data/spec/influxdb/client_spec.rb

@@ -381,6 +381,27 @@ describe InfluxDB::Client do
 
       @influxdb.write_point("seriez", data, false, "m").should be_a(Net::HTTPOK)
     end
+
+    describe "async" do
+
+      it "should push to the worker with payload if client is async" do
+        @influxdb = InfluxDB::Client.new "database", :host => "influxdb.test", :async => true
+
+        data = {:name => "juan", :age => 87, :time => Time.now.to_i}
+        @influxdb.stub_chain(:worker, :push).with(hash_including({:name => 'seriez'})).and_return(:ok)
+        @influxdb.write_point("seriez", data).should eq(:ok)
+      end
+
+      it "should push to the worker with payload if write_point call is async" do
+        @influxdb = InfluxDB::Client.new "database", :host => "influxdb.test", :async => false
+
+        data = {:name => "juan", :age => 87, :time => Time.now.to_i}
+        @influxdb.stub_chain(:worker, :push).with(hash_including({:name => 'seriez'})).and_return(:ok)
+        @influxdb.write_point("seriez", data, true).should eq(:ok)
+      end
+
+    end
+
   end
 
   describe "#execute_queries" do

data/spec/influxdb/worker_spec.rb

@@ -0,0 +1,26 @@
+require "spec_helper"
+require 'timeout'
+
+describe InfluxDB::Worker do
+  let(:fake_client) { double() }
+  let(:worker) { InfluxDB::Worker.new(fake_client) }
+
+  describe "#push" do
+    let(:payload) { {:name => "juan", :age => 87, :time => Time.now.to_i} }
+
+    it "should _write to the client" do
+      queue = Queue.new
+      expect(fake_client).to receive(:_write).once.with([payload]).and_return do |data|
+        queue.push(:received)
+      end
+      worker.push(payload)
+
+      Timeout.timeout(InfluxDB::Worker::SLEEP_INTERVAL) do
+        queue.pop()
+      end
+    end
+
+  end
+
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: influxdb
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Todd Persen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-25 00:00:00.000000000 Z
+date: 2014-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -105,6 +105,7 @@ files:
 - spec/influxdb/client_spec.rb
 - spec/influxdb/logger_spec.rb
 - spec/influxdb/point_value_spec.rb
+- spec/influxdb/worker_spec.rb
 - spec/influxdb_spec.rb
 - spec/max_queue_spec.rb
 - spec/spec_helper.rb
@@ -136,6 +137,7 @@ test_files:
 - spec/influxdb/client_spec.rb
 - spec/influxdb/logger_spec.rb
 - spec/influxdb/point_value_spec.rb
+- spec/influxdb/worker_spec.rb
 - spec/influxdb_spec.rb
 - spec/max_queue_spec.rb
 - spec/spec_helper.rb