influxdb 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89e34f73dc79fdd7911d7b95222437c9a36b3839
-  data.tar.gz: 2e62a50a70a4b7848a66a84d1033d49194d09445
+  metadata.gz: 3d95423eb09fb3461645edb8f9457a9a6dc094c8
+  data.tar.gz: 6bbf73b5876f7993b1a04d701dbb2ba1a7794370
 SHA512:
-  metadata.gz: 04a951e2106d61547d4409ebac4dcb2055c5d38012fc9b40cb97d46af7dfa9426fc27f7a27b7657e9587faf7d15d322d2e80a4b7f8da6967e2fc06edcff1458b
-  data.tar.gz: 51ec22a345e521fc8adcfd7ec71a2bc488098d389b9b9463a51acd2ea262c86297d4d015fd5ceb8fb026eba9a9ecf6f82ed985f3dce62ee8641da7668f298e48
+  metadata.gz: afa9177aa3c48c6edffb13021095cf7cd660d83f4b192d4b4cc08353b086e708ec30f2da8f66e0fd174845dd52963d5e3e7563948d9d16d98297215dec874eb1
+  data.tar.gz: f38524a088d7cc795c5d13b9abc5b4bb873a25d282921decb03235acfbb9de5f0495afef5cb87438a3f186f971fee64bb600c6e19e67f38d865d3d20eb440d11

data/lib/influxdb/client.rb

@@ -11,7 +11,8 @@ module InfluxDB
                   :password,
                   :database,
                   :time_precision,
-                  :use_ssl
+                  :use_ssl,
+                  :stopped
 
     attr_accessor :queue, :worker
 
@@ -41,7 +42,7 @@ module InfluxDB
     def initialize *args
       @database = args.first if args.first.is_a? String
       opts = args.last.is_a?(Hash) ? args.last : {}
-      @hosts = opts[:hosts] || opts[:host] || ["localhost"]
+      @hosts = Array(opts[:hosts] || opts[:host] || ["localhost"])
       @port = opts[:port] || 8086
       @username = opts[:username] || "root"
       @password = opts[:password] || "root"
@@ -55,9 +56,7 @@ module InfluxDB
 
       @worker = InfluxDB::Worker.new(self) if @async
 
-      unless @hosts.is_a? Array
-        @hosts = [@hosts]
-      end
+      at_exit { stop! }
     end
 
     ## allow options, e.g. influxdb.create_database('foo', replicationFactor: 3)
@@ -168,6 +167,14 @@ module InfluxDB
       end
     end
 
+    def stop!
+      @stopped = true
+    end
+
+    def stopped?
+      @stopped
+    end
+
     private
     def full_url(path, params=nil)
       "".tap do |url|
@@ -229,12 +236,15 @@ module InfluxDB
         block.call(http)
 
       rescue Timeout::Error, *InfluxDB::NET_HTTP_EXCEPTIONS => e
-        log :error, "Failed to contact host #{host}: #{e.inspect} - retrying in #{delay}s."
+        log :error, "Failed to contact host #{host}: #{e.inspect} #{"- retrying in #{delay}s." unless stopped?}"
         log :info, "Queue size is #{@queue.length}." unless @queue.nil?
-
-        sleep delay
-        delay = [@max_delay, delay * 2].min
-        retry
+        if stopped?
+          raise e
+        else
+          sleep delay
+          delay = [@max_delay, delay * 2].min
+          retry
+        end
       end
     end
 

data/lib/influxdb/version.rb

@@ -1,3 +1,3 @@
 module InfluxDB
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/influxdb/worker.rb

@@ -43,7 +43,7 @@ module InfluxDB
             check_background_queue(thread_num) until @queue.empty?
           end
 
-          while true
+          while !client.stopped?
             self.check_background_queue(thread_num)
             sleep rand(SLEEP_INTERVAL)
           end

data/spec/influxdb/client_spec.rb

@@ -259,6 +259,38 @@ describe InfluxDB::Client do
       @influxdb.write_point("seriez", data).should be_a(Net::HTTPOK)
     end
 
+    describe "retrying requests" do
+      let(:body) do
+        [{
+             "name" => "seriez",
+             "points" => [[87, "juan"]],
+             "columns" => ["age", "name"]
+         }]
+      end
+
+      let(:data) { {:name => "juan", :age => 87} }
+
+      subject { @influxdb.write_point("seriez", data) }
+
+      before do
+        allow(@influxdb).to receive(:log)
+        stub_request(:post, "http://influxdb.test:9999/db/database/series").with(
+            :query => {:u => "username", :p => "password", :time_precision => "s"},
+            :body => body
+        ).to_raise(Timeout::Error).then.to_return(:status => 200)
+      end
+
+      it "retries on http errors when not stopped" do
+        expect(subject).to be_a(Net::HTTPOK)
+      end
+
+      it "raises when stopped" do
+        @influxdb.stop!
+        expect { subject }.to raise_error(Timeout::Error)
+      end
+
+    end
+
     it "raise an exception if the server didn't return 200" do
       body = [{
         "name" => "seriez",

data/spec/influxdb/worker_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 require 'timeout'
 
 describe InfluxDB::Worker do
-  let(:fake_client) { double() }
+  let(:fake_client) { double(stopped?: false) }
   let(:worker) { InfluxDB::Worker.new(fake_client) }
 
   describe "#push" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: influxdb
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Todd Persen