influxdb 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3dbf2a3bd000d956cd08c67f935e5e9b80b7d03
-  data.tar.gz: 140163253ece45b18b0a1d4a371a9c7062c70285
+  metadata.gz: ef1ebbbcacc05c56d8bbabdbd22848361b6ac3f6
+  data.tar.gz: 737cc1c7fb163655ccec58afdb6261084646b620
 SHA512:
-  metadata.gz: 3d769deb45adc98a3ab185606b309f887c82e160ef0c58a0090d00892b9dfdce4dbeff7c7965e31c86d45d5122f87bdc23eb7c637abc56e03763f1a6013747fe
-  data.tar.gz: a4f6ffa3cb9371424696df45d3a9657b67c7b226e7b585f52334cc415fa792f6f41c52700d59f80afdcfdabca06cf2f9d76264f6947c7f512cdb65887778c28d
+  metadata.gz: 4c1e764c646a040c133c7bf9f2ce299fee0da7091a872437ee2586de8496aea944d9994f57aa3b83c30e4cb0ebf297cf69b4e4cbb910d99a1da2cb5b8218cee5
+  data.tar.gz: c753626ee6dde17ed931febfe12656e5d7c3c5ab380ad333f28930d464808595805d12649e908383cf2d7287e9281a17f8b1826f236d912c95aa51ea73c5da59

data/CHANGELOG.md

@@ -4,6 +4,12 @@ For the full commit log, [see here](https://github.com/influxdata/influxdb-ruby/
 
 ## Unreleased changes
 
+- None.
+
+## v0.5.2, released 2017-11-28
+
+- Add async option to block on full queue (#209, @davemt)
+
 ## v0.5.1, released 2017-10-31
 
 - Add support for `SHARD DURATION` in retention policy (#203, @ljagiello)

data/README.md

@@ -157,7 +157,7 @@ influxdb.write_point(name, data, time_precision)
 >
 > ```ruby
 > influxdb = InfluxDB::Client.new time_precision: "ms"
-> time = (Time.now.to_r * 10**6).to_i
+> time = (Time.now.to_r * 1000).to_i
 > influxdb.write_point("foobar", { values: { n: 42 }, timestamp: time })
 > ```
 
@@ -282,14 +282,16 @@ Using `async: true` is a shortcut for the following:
 ``` ruby
 async_options = {
   # number of points to write to the server at once
-  max_post_points:    1000,
+  max_post_points:     1000,
   # queue capacity
-  max_queue_size:     10_000,
+  max_queue_size:      10_000,
   # number of threads
-  num_worker_threads: 3,
+  num_worker_threads:  3,
   # max. time (in seconds) a thread sleeps before
   # checking if there are new jobs in the queue
-  sleep_interval:     5
+  sleep_interval:      5,
+  # whether client will block if queue is full
+  block_on_full_queue: false
 }
 
 influxdb = InfluxDB::Client.new database, async: async_options

data/lib/influxdb/version.rb

@@ -1,3 +1,3 @@
 module InfluxDB # :nodoc:
-  VERSION = "0.5.1".freeze
+  VERSION = "0.5.2".freeze
 end

data/lib/influxdb/writer/async.rb

@@ -34,7 +34,8 @@ module InfluxDB
                     :max_post_points,
                     :max_queue_size,
                     :num_worker_threads,
-                    :sleep_interval
+                    :sleep_interval,
+                    :block_on_full_queue
 
         include InfluxDB::Logging
 
@@ -42,17 +43,20 @@ module InfluxDB
         MAX_QUEUE_SIZE      = 10_000
         NUM_WORKER_THREADS  = 3
         SLEEP_INTERVAL      = 5
+        BLOCK_ON_FULL_QUEUE = false
 
         def initialize(client, config)
           @client = client
           config = config.is_a?(Hash) ? config : {}
 
-          @max_post_points    = config.fetch(:max_post_points,    MAX_POST_POINTS)
-          @max_queue_size     = config.fetch(:max_queue_size,     MAX_QUEUE_SIZE)
-          @num_worker_threads = config.fetch(:num_worker_threads, NUM_WORKER_THREADS)
-          @sleep_interval     = config.fetch(:sleep_interval,     SLEEP_INTERVAL)
+          @max_post_points     = config.fetch(:max_post_points,     MAX_POST_POINTS)
+          @max_queue_size      = config.fetch(:max_queue_size,      MAX_QUEUE_SIZE)
+          @num_worker_threads  = config.fetch(:num_worker_threads,  NUM_WORKER_THREADS)
+          @sleep_interval      = config.fetch(:sleep_interval,      SLEEP_INTERVAL)
+          @block_on_full_queue = config.fetch(:block_on_full_queue, BLOCK_ON_FULL_QUEUE)
 
-          @queue = InfluxDB::MaxQueue.new max_queue_size
+          queue_class = @block_on_full_queue ? SizedQueue : InfluxDB::MaxQueue
+          @queue = queue_class.new max_queue_size
 
           spawn_threads!
         end

data/spec/influxdb/cases/async_client_spec.rb

@@ -86,10 +86,11 @@ describe InfluxDB::Client do
   describe "async options" do
     let(:async_options) do
       {
-        max_post_points:    10,
-        max_queue_size:     100,
-        num_worker_threads: 1,
-        sleep_interval:     0.5
+        max_post_points:     10,
+        max_queue_size:      100,
+        num_worker_threads:  1,
+        sleep_interval:      0.5,
+        block_on_full_queue: false
       }
     end
 
@@ -100,5 +101,7 @@ describe InfluxDB::Client do
     specify { expect(subject.max_queue_size).to be 100 }
     specify { expect(subject.num_worker_threads).to be 1 }
     specify { expect(subject.sleep_interval).to be_within(0.0001).of(0.5) }
+    specify { expect(subject.block_on_full_queue).to be false }
+    specify { expect(subject.queue).to be_kind_of(InfluxDB::MaxQueue) }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: influxdb
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Todd Persen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-31 00:00:00.000000000 Z
+date: 2017-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler