timberline 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5dcba7d76edc4b00c7060cfa2c01e7df38700912
-  data.tar.gz: f3dad3c3080a4c35db3f91f2b8b599f008039bf7
+  metadata.gz: 8e1df2f3cc18ce504f11aec22b955a5ff6b92884
+  data.tar.gz: 94879a8342807a14a3ac4d5072c90eaa7c6f4f88
 SHA512:
-  metadata.gz: 03b760d6e84c72d91884ee18f87fa797577839f16e495148c144144780adfeab120e8bb2ffb4661eec4d51d1e4dbc06e14a0faab6cef95400712a3c3a6fbb2d0
-  data.tar.gz: 3cbb508700948108bbabd33e1e24e0f98189ae06545047dec89479cb9e3266aeb7b9116bae2fd6c931434722b77cd5e81b91c21df54c869412174ca1f3f20d7f
+  metadata.gz: 4b8859df734695a2c6550b8130a1a79df7c47eb50b412b85800a112231f44844b40c370a4dd9413fdf4c566ae7540c2bbf0411289deb908f41a574f008f27f62
+  data.tar.gz: 5c03733de228b0a3f5573ab32fdf2442d6a689e2de8e041f14e92c8e6aa10d30f8a185794f803d87f107eaf94c70b827eecec75365aa6d8dd2d8696b7c09df4e

data/CHANGELOG

@@ -1,3 +1,5 @@
+0.8.4
+  - Allow stat_timeout and max_retries to be set from config 
 0.8.3
   - Add support for configuring via env var
   - Add support for Redis sentinels

data/lib/timberline/config.rb

@@ -105,7 +105,7 @@ class Timberline
       @password = uri.password
 
       params = uri.query.nil? ? {} : CGI.parse(uri.query)
-      %w(timeout namespace).each do |setting|
+      %w(timeout namespace stat_timeout max_retries).each do |setting|
         next unless params.key?(setting)
         instance_variable_set("@#{setting}", convert_if_int(params[setting][0]))
       end
@@ -119,7 +119,7 @@ class Timberline
 
     def load_from_yaml(yaml_config)
       fail "Missing yaml configs!" if yaml_config.nil?
-      %w(database host port timeout password namespace sentinels).each do |setting|
+      %w(database host port timeout password namespace sentinels stat_timeout max_retries).each do |setting|
         instance_variable_set("@#{setting}", yaml_config[setting])
       end
     end

data/lib/timberline/version.rb

@@ -1,4 +1,4 @@
 class Timberline
   # The current canonical version for Timberline.
-  VERSION = "0.8.3"
+  VERSION = "0.8.4"
 end

data/spec/config/test_config.yaml

@@ -4,6 +4,8 @@ timeout: 10
 password: foo
 database: 3
 namespace: treecurve
+max_retries: 1212
+stat_timeout: 1313
 sentinels:
   -
     host: localhost

data/spec/lib/timberline/config_spec.rb

@@ -4,7 +4,7 @@ describe Timberline::Config do
   describe "newly created" do
     context "when the TIMBERLINE_URL env var is defined" do
       before do
-        ENV["TIMBERLINE_URL"] = "redis://:apassword@ahostname:9000/3?timeout=666&namespace=foobar&sentinel=sentinel1:1&sentinel=sentinel2:2"
+        ENV["TIMBERLINE_URL"] = "redis://:apassword@ahostname:9000/3?timeout=666&namespace=foobar&sentinel=sentinel1:1&sentinel=sentinel2:2&max_retries=99&stat_timeout=12"
       end
 
       after do
@@ -35,6 +35,14 @@ describe Timberline::Config do
         expect(subject.namespace).to eq("foobar")
       end
 
+      it "loads the stat_timeout from the env var" do
+        expect(subject.stat_timeout).to eq(12)
+      end
+
+      it "loads the max_retries from the env var" do
+        expect(subject.max_retries).to eq(99)
+      end
+
       it "loads the sentinel servers" do
         expect(subject.sentinels).to eq([
           { "host" => "sentinel1", "port" => 1 },
@@ -69,6 +77,14 @@ describe Timberline::Config do
           expect(subject.password).to eq("foo")
         end
 
+        it "loads the max_retries from the config file" do
+          expect(subject.max_retries).to eq(1212)
+        end
+
+        it "loads the stat_timeout from the config file" do
+          expect(subject.stat_timeout).to eq(1313)
+        end
+
         it "loads the database from the config file" do
           expect(subject.database).to eq(3)
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timberline
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - Tommy Morgan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-12 00:00:00.000000000 Z
+date: 2015-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis