influxdb 0.0.17 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d70a9878bd1e5c317027674416232aa8a04ae7d
-  data.tar.gz: 04aa90bf5904206307fe68d2ea09dec094792e9a
+  metadata.gz: b18af835198acf64a60f0b61b3464e79dcbf98e8
+  data.tar.gz: 068c5f701cfe5a346778017cfdb72ae622ecaa37
 SHA512:
-  metadata.gz: be3a486311a2a5506dad439e1aba5d6dfd1c11d54bfd665be5f80d89a958ae40ae641eb40718c4ffe422a1b4d1a02dac4a7ec7dbdb530c7dff1dee91dc4caa62
-  data.tar.gz: 59e4d64307c3b4662cf652511ec9f2a1b4c0df7cb293792d5eccfa0d4c804f65ecce0b970ee22c3cd607f39d8d778142f86917df467c1127191ea3e54c47709e
+  metadata.gz: 63fe3e1f05b0a61c685a2fc8d536b5d343311c315d5c3ae9502a8fe1b1526657e544087afa330570c840d7bcdca85d28785cb654034b2832206b5397a902f9eb
+  data.tar.gz: 6e885b8eac8803845c3779d801e1eac99c5d90836de81f3f70ed92a8cf0400e9cd333790a6f303a13cbacf298c64606f2185f312e6532f293f70a893e4b623c8

data/lib/influxdb/client.rb

@@ -5,7 +5,14 @@ require 'json'
 
 module InfluxDB
   class Client
-    attr_accessor :host, :port, :username, :password, :database, :time_precision
+    attr_accessor :hosts,
+                  :port,
+                  :username,
+                  :password,
+                  :database,
+                  :time_precision,
+                  :use_ssl
+
     attr_accessor :queue, :worker
 
     include InfluxDB::Logger
@@ -34,13 +41,21 @@ module InfluxDB
     def initialize *args
       @database = args.first if args.first.is_a? String
       opts = args.last.is_a?(Hash) ? args.last : {}
-      @host = opts[:host] || "localhost"
+      @hosts = opts[:hosts] || opts[:host] || ["localhost"]
       @port = opts[:port] || 8086
       @username = opts[:username] || "root"
       @password = opts[:password] || "root"
-      @http = Net::HTTP.new(@host, @port)
-      @http.use_ssl = opts[:use_ssl]
+      @use_ssl = opts[:use_ssl] || false
       @time_precision = opts[:time_precision] || "s"
+      @initial_delay = opts[:initial_delay] || 0.01
+      @max_delay = opts[:max_delay] || 30
+      @open_timeout = opts[:write_timeout] || 5
+      @read_timeout = opts[:read_timeout] || 300
+      @async = opts[:async] || false
+
+      unless @hosts.is_a? Array
+        @hosts = [@hosts]
+      end
     end
 
     ## allow options, e.g. influxdb.create_database('foo', replicationFactor: 3)
@@ -111,7 +126,7 @@ module InfluxDB
       get full_url("continuous_queries")
     end
 
-    def write_point(name, data, async=false, time_precision=@time_precision)
+    def write_point(name, data, async=@async, time_precision=@time_precision)
       data = data.is_a?(Array) ? data : [data]
       columns = data.reduce(:merge).keys.sort {|a,b| a.to_s <=> b.to_s}
       payload = {:name => name, :points => [], :columns => columns}
@@ -123,14 +138,14 @@ module InfluxDB
       end
 
       if async
-        @worker = InfluxDB::Worker.new if @worker.nil?
+        @worker = InfluxDB::Worker.new(self) if @worker.nil?
         @worker.queue.push(payload)
       else
         _write([payload], time_precision)
       end
     end
 
-    def _write(payload, time_precision=nil)
+    def _write(payload, time_precision=@time_precision)
       url = full_url("db/#{@database}/series", "time_precision=#{time_precision}")
       data = JSON.generate(payload)
       post(url, data)
@@ -161,36 +176,63 @@ module InfluxDB
     end
 
     def get(url)
-      response = @http.request(Net::HTTP::Get.new(url))
-      if response.kind_of? Net::HTTPSuccess
-        return JSON.parse(response.body)
-      elsif response.kind_of? Net::HTTPUnauthorized
-        raise InfluxDB::AuthenticationError.new response.body
-      else
-        raise InfluxDB::Error.new response.body
+      connect_with_retry do |http|
+        response = http.request(Net::HTTP::Get.new(url))
+        if response.kind_of? Net::HTTPSuccess
+          return JSON.parse(response.body)
+        elsif response.kind_of? Net::HTTPUnauthorized
+          raise InfluxDB::AuthenticationError.new response.body
+        else
+          raise InfluxDB::Error.new response.body
+        end
       end
     end
 
     def post(url, data)
       headers = {"Content-Type" => "application/json"}
-      response = @http.request(Net::HTTP::Post.new(url, headers), data)
-      if response.kind_of? Net::HTTPSuccess
-        return response
-      elsif response.kind_of? Net::HTTPUnauthorized
-        raise InfluxDB::AuthenticationError.new response.body
-      else
-        raise InfluxDB::Error.new response.body
+      connect_with_retry do |http|
+        response = http.request(Net::HTTP::Post.new(url, headers), data)
+        if response.kind_of? Net::HTTPSuccess
+          return response
+        elsif response.kind_of? Net::HTTPUnauthorized
+          raise InfluxDB::AuthenticationError.new response.body
+        else
+          raise InfluxDB::Error.new response.body
+        end
       end
     end
 
     def delete(url)
-      response = @http.request(Net::HTTP::Delete.new(url))
-      if response.kind_of? Net::HTTPSuccess
-        return response
-      elsif response.kind_of? Net::HTTPUnauthorized
-        raise InfluxDB::AuthenticationError.new response.body
-      else
-        raise InfluxDB::Error.new response.body
+      connect_with_retry do |http|
+        response = http.request(Net::HTTP::Delete.new(url))
+        if response.kind_of? Net::HTTPSuccess
+          return response
+        elsif response.kind_of? Net::HTTPUnauthorized
+          raise InfluxDB::AuthenticationError.new response.body
+        else
+          raise InfluxDB::Error.new response.body
+        end
+      end
+    end
+
+    def connect_with_retry(&block)
+      hosts = @hosts.dup
+      delay = @initial_delay
+
+      begin
+        hosts.push(host = hosts.shift)
+        http = Net::HTTP.new(host, @port)
+        http.open_timeout = @open_timeout
+        http.read_timeout = @read_timeout
+        http.use_ssl = @use_ssl
+        block.call(http)
+      rescue StandardError => e
+        log :error, "Failed to contact host #{host}: #{e.inspect} - retrying in #{delay}s."
+        log :info, "Queue size is #{@queue.length}." unless @queue.nil?
+
+        sleep delay
+        delay = [@max_delay, delay * 2].min
+        retry
       end
     end
 

data/lib/influxdb/errors.rb

@@ -1,5 +1,5 @@
 module InfluxDB
-  class Error < StandardError
+  class Error < Exception
   end
 
   class AuthenticationError < Error

data/lib/influxdb/version.rb

@@ -1,3 +1,3 @@
 module InfluxDB
-  VERSION = "0.0.17"
+  VERSION = "0.1.0"
 end

data/lib/influxdb/worker.rb

@@ -4,16 +4,18 @@ require "uri"
 
 module InfluxDB
   class Worker
+    attr_reader :client
     attr_accessor :queue
 
     include InfluxDB::Logger
 
-    MAX_POST_POINTS = 200
+    MAX_POST_POINTS = 1000
     NUM_WORKER_THREADS = 3
-    SLEEP_INTERVAL = 500
+    SLEEP_INTERVAL = 5
 
-    def initialize
+    def initialize(client)
       @queue = InfluxDB::MaxQueue.new
+      @client = client
       spawn_threads!
     end
 
@@ -38,8 +40,8 @@ module InfluxDB
           end
 
           while true
-            sleep SLEEP_INTERVAL
             self.check_background_queue(thread_num)
+            sleep SLEEP_INTERVAL
           end
         end
       end
@@ -53,12 +55,14 @@ module InfluxDB
 
         while data.size < MAX_POST_POINTS && !@queue.empty?
           p = @queue.pop(true) rescue next;
-          log :debug, "Found data in the queue! (#{p[:n]})"
           data.push p
         end
 
+        return if data.empty?
+
         begin
-          _write(data)
+          log :debug, "Found data in the queue! (#{data.length} points)"
+          @client._write(data)
         rescue => e
           puts "Cannot write data: #{e.inspect}"
         end

data/spec/influxdb/client_spec.rb

@@ -14,18 +14,18 @@ describe InfluxDB::Client do
 
         @influxdb.should be_a InfluxDB::Client
         @influxdb.database.should be_nil
-        @influxdb.host.should == "localhost"
+        @influxdb.hosts.should == ["localhost"]
         @influxdb.port.should == 8086
         @influxdb.username.should == "root"
         @influxdb.password.should == "root"
-        @influxdb.instance_variable_get(:@http).use_ssl?.should == false
+        @influxdb.use_ssl.should be_false
         @influxdb.time_precision.should == "s"
       end
     end
 
     describe "with no database specified" do
       it "should be initialized with a nil database and the specified options" do
-        @influxdb = InfluxDB::Client.new :hostname => "host",
+        @influxdb = InfluxDB::Client.new :host => "host",
                                          :port => "port",
                                          :username => "username",
                                          :password => "password",
@@ -33,7 +33,7 @@ describe InfluxDB::Client do
 
         @influxdb.should be_a InfluxDB::Client
         @influxdb.database.should be_nil
-        @influxdb.host.should == "localhost"
+        @influxdb.hosts.should == ["host"]
         @influxdb.port.should == "port"
         @influxdb.username.should == "username"
         @influxdb.password.should == "password"
@@ -47,7 +47,7 @@ describe InfluxDB::Client do
 
         @influxdb.should be_a(InfluxDB::Client)
         @influxdb.database.should == "database"
-        @influxdb.host.should == "localhost"
+        @influxdb.hosts.should == ["localhost"]
         @influxdb.port.should == 8086
         @influxdb.username.should == "root"
         @influxdb.password.should == "root"
@@ -57,7 +57,7 @@ describe InfluxDB::Client do
 
     describe "with both a database and options specified" do
       it "should be initialized with the specified database and options" do
-        @influxdb = InfluxDB::Client.new "database", :hostname => "host",
+        @influxdb = InfluxDB::Client.new "database", :host => "host",
                                                      :port => "port",
                                                      :username => "username",
                                                      :password => "password",
@@ -65,7 +65,7 @@ describe InfluxDB::Client do
 
         @influxdb.should be_a(InfluxDB::Client)
         @influxdb.database.should == "database"
-        @influxdb.host.should == "localhost"
+        @influxdb.hosts.should == ["host"]
         @influxdb.port.should == "port"
         @influxdb.username.should == "username"
         @influxdb.password.should == "password"
@@ -75,15 +75,28 @@ describe InfluxDB::Client do
 
     describe "with ssl option specified" do
       it "should be initialized with ssl enabled" do
-        @influxdb = InfluxDB::Client.new nil, :use_ssl => true
+        @influxdb = InfluxDB::Client.new :use_ssl => true
 
         @influxdb.should be_a InfluxDB::Client
         @influxdb.database.should be_nil
-        @influxdb.host.should == "localhost"
+        @influxdb.hosts.should == ["localhost"]
+        @influxdb.port.should == 8086
+        @influxdb.username.should == "root"
+        @influxdb.password.should == "root"
+        @influxdb.use_ssl.should be_true
+      end
+    end
+
+    describe "with multiple hosts specified" do
+      it "should be initialized with ssl enabled" do
+        @influxdb = InfluxDB::Client.new :hosts => ["1.1.1.1", "2.2.2.2"]
+
+        @influxdb.should be_a InfluxDB::Client
+        @influxdb.database.should be_nil
+        @influxdb.hosts.should == ["1.1.1.1", "2.2.2.2"]
         @influxdb.port.should == 8086
         @influxdb.username.should == "root"
         @influxdb.password.should == "root"
-        @influxdb.instance_variable_get(:@http).use_ssl?.should == true
       end
     end
   end
@@ -349,7 +362,7 @@ describe InfluxDB::Client do
       data = {:name => "juan", :age => 87, :time => time_in_seconds}
 
       @influxdb.write_point("seriez", data).should be_a(Net::HTTPOK)
-    end    
+    end
 
     it "should POST to add points with time field with precision defined in call of write function" do
       time_in_milliseconds = (Time.now.to_f * 1000).to_i
@@ -367,7 +380,7 @@ describe InfluxDB::Client do
       data = {:name => "juan", :age => 87, :time => time_in_milliseconds}
 
       @influxdb.write_point("seriez", data, false, "m").should be_a(Net::HTTPOK)
-    end    
+    end
   end
 
   describe "#execute_queries" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: influxdb
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.1.0
 platform: ruby
 authors:
 - Todd Persen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-13 00:00:00.000000000 Z
+date: 2014-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json