consul-templaterb 1.9.5 → 1.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 641ec7ace0ee7b0bdad06b8cbaef7ceba31b520f0302ef3504cee674e48344ed
-  data.tar.gz: 7d996fff12f90c62b9a402342ad4b51265ae2dc59df53cdd9ee3774aabe62b29
+  metadata.gz: d97e523ed7d46b52d6f8076263af42d649f01f74085d5ae58a613cf38ab14e31
+  data.tar.gz: 99255a8e34cae9c05d685f88df56452b77b939d99c6c0b0d48fa3b2156e40457
 SHA512:
-  metadata.gz: 5f904d40d4b51ca467ac13455bca0047ead220e2377143b33d610b44479b5d480ca5cec055f4628de2bde86df03711d56c3c65f5bd870b4ea3ad4a0e0a8f4adb
-  data.tar.gz: e653a1d9c5e2656110cb7168e4f825b4a2eb3b4cee951ad1bce2ba574f311f0f65ee800d34eceb61a18458f68b593531d2ccd3dd72fa4b04306cbdf20f542bc4
+  metadata.gz: b6c10ccb302c52e4c97d5b7620b6123cbbca69abe720b8ef2764fbc30fd449ea5fc89412ad9bf7ade0de3c8f12b67dcb5d6058159cf3db212bf452c6efaa9067
+  data.tar.gz: 168bf127d58cff2c48de8cddda29b6eeac7d113563c61b15dea881fbfb2339e46b69734ad681ba6d3298d50a548b87707faea3d506ce9188f7580de321126b8f

data/.rubocop.yml

@@ -28,7 +28,7 @@ Metrics/ParameterLists:
   Max: 12
 
 Metrics/PerceivedComplexity:
-  Max: 20
+  Max: 22
 
 Style/Documentation:
   Enabled: false

data/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 ## (UNRELEASED)
 
+## 1.9.6 (January 15, 2019)
+
+BUGFIX:
+
+ * Keep connections open properly as it increase timeouts on Consul servers on
+   very large templates
+
+IMPROVEMENTS:
+
+ * Display error message when Retrying every 10 errors
+
 ## 1.9.5 (January 14, 2019)
 
 BUGFIX:

data/lib/consul/async/consul_endpoint.rb

@@ -215,7 +215,9 @@ module Consul
             # Dirty hack, but contrary to other path, when key is not present, Consul returns 404
             is_kv_empty = path.start_with?('/v1/kv') && http.response_header.status == 404
             if !is_kv_empty && enforce_json_200 && http.response_header.status != 200 && http.response_header['Content-Type'] != 'application/json'
-              _handle_error(http, consul_index) { connection[:conn] = EventMachine::HttpRequest.new(conf.base_url, options) }
+              _handle_error(http, consul_index) do
+                STDERR.puts "[RETRY][#{path}] (#{@consecutive_errors} errors)" if (@consecutive_errors % 10) == 1
+              end
             else
               n_consul_index = find_x_consul_index(http)
               @x_consul_index = n_consul_index.to_i if n_consul_index
@@ -250,7 +252,7 @@ module Consul
           http.errback do
             unless @stopping
               _handle_error(http, consul_index) do
-                connection[:conn] = EventMachine::HttpRequest.new(conf.base_url, options)
+                STDERR.puts "[RETRY][#{path}] (#{@consecutive_errors} errors) due to #{http.error}" if (@consecutive_errors % 10) == 1
               end
             end
           end

data/lib/consul/async/version.rb

@@ -1,5 +1,5 @@
 module Consul
   module Async
-    VERSION = '1.9.5'.freeze
+    VERSION = '1.9.6'.freeze
   end
 end

data/samples/consul-ui/timeline.json.erb

@@ -32,12 +32,17 @@ cur_state = services.map do |service_name, _tags|
   instances = snodes
               .sort { |a, b| a['Node']['Node'] <=> b['Node']['Node'] }
               .map do |instance|
+    mod_index = instance['Service']['ModifyIndex'] || 0
+    instance['Checks'].each do |chk|
+      mindex = chk['ModifyIndex'] || 0
+      mod_index = mindex if mod_index < mindex
+    end
     ["#{instance['Node']['Node']}:#{instance['Service']['ID']}",
      {
        'address' => instance.service_address,
        'node' => instance['Node']['Node'],
        'port' => instance['Service']['Port'],
-       'idx'  => (instance['Service']['ModifyIndex'] || cur_index).to_i,
+       'idx'  => mod_index || cur_index,
        'status' => instance.status,
        'stats' => cur_stats,
        'checks' => instance['Checks'].map { |check| [check['CheckID'], { 'name' => check['Name'], 'status' => check['Status'], 'output' => check['Output'] }] }.to_h

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul-templaterb
 version: !ruby/object:Gem::Version
-  version: 1.9.5
+  version: 1.9.6
 platform: ruby
 authors:
 - SRE Core Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-14 00:00:00.000000000 Z
+date: 2019-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request