Follow client configuration options

influxdata · Feb 28, 2021 · 60edb69 · 60edb69
1 parent ea78ac9
commit 60edb69
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 34 deletions.
diff --git a/lib/influxdb-rails.rb b/lib/influxdb-rails.rb
@@ -55,8 +55,7 @@ def client
             read_timeout:  cfg.read_timeout,
             use_ssl:       cfg.use_ssl,
             logger:        logger,
-            async:         cfg.async,
-            retries:       cfg.retries
+            async:         cfg.async
           )
         end
       end

diff --git a/lib/influxdb/rails/configuration.rb b/lib/influxdb/rails/configuration.rb
@@ -35,18 +35,17 @@ class ClientConfig
       private_constant :WRITE_TYPE
 
       set_defaults(
-        url:                "http://localhost:8086".freeze,
-        token:              nil,
-        org:                nil,
-        bucket:             nil,
-        use_ssl:            true,
-        open_timeout:       5,
-        write_timeout:      5,
-        read_timeout:       60,
-        precision:          ::InfluxDB2::WritePrecision::MILLISECOND,
-        retries:            0,
-        async:              true,
-        max_retry_delay_ms: 10 * 1000
+        url:           "http://localhost:8086".freeze,
+        token:         nil,
+        org:           nil,
+        bucket:        nil,
+        use_ssl:       true,
+        open_timeout:  5,
+        write_timeout: 5,
+        read_timeout:  60,
+        precision:     ::InfluxDB2::WritePrecision::MILLISECOND,
+        max_retries:   0,
+        async:         true
       )
 
       def initialize
@@ -56,7 +55,7 @@ def initialize
       def write_options
         InfluxDB2::WriteOptions.new(
           write_type:  WRITE_TYPE[async],
-          max_retries: retries
+          max_retries: max_retries
         )
       end
     end

diff --git a/lib/rails/generators/influxdb/templates/initializer.rb b/lib/rails/generators/influxdb/templates/initializer.rb
@@ -16,8 +16,7 @@
   # config.client.write_timeout = 5.seconds
   # config.client.read_timeout = 60.seconds
   # config.client.time_precisions = InfluxDB2::WritePrecision::MILLISECOND
-  # config.client.retries = 0
-  # config.client.max_retry_delay_ms = 10_000
+  # config.client.max_retries = 0
   # config.client.async = true
 
   ## Disable rails framework hooks.

diff --git a/spec/unit/configuration_spec.rb b/spec/unit/configuration_spec.rb
@@ -8,16 +8,16 @@
   describe "client configuration" do
     subject { InfluxDB::Rails.configuration.client }
 
-    describe "#retries" do
+    describe "#max_retries" do
       it "defaults to 0" do
-        expect(subject.retries).to eq(0)
+        expect(subject.max_retries).to eq(0)
       end
 
       it "can be updated" do
         InfluxDB::Rails.configure do |config|
-          config.client.retries = 5
+          config.client.max_retries = 5
         end
-        expect(subject.retries).to eql(5)
+        expect(subject.max_retries).to eql(5)
         expect(subject.write_options.max_retries).to eql(5)
       end
     end
@@ -61,19 +61,6 @@
       end
     end
 
-    describe "#max_retry_delay_ms" do
-      it "defaults to 10 seconds in milliseconds" do
-        expect(subject.max_retry_delay_ms).to eql(10_000)
-      end
-
-      it "can be updated" do
-        InfluxDB::Rails.configure do |config|
-          config.client.max_retry_delay_ms = 5
-        end
-        expect(subject.max_retry_delay_ms).to eql(5)
-      end
-    end
-
     describe "#precision" do
       it "defaults to milli seconds" do
         expect(subject.precision).to eql(::InfluxDB2::WritePrecision::MILLISECOND)