consul-templaterb 1.9.4 → 1.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a838b58bd969446e1469ebef427c75f274a20f2120286495c1749dc8ad01e9f3
-  data.tar.gz: 3c7f4961230c1f5c0496a3d4e6f7e0ace0e757c28ade29c0a88afaffc01709cc
+  metadata.gz: 641ec7ace0ee7b0bdad06b8cbaef7ceba31b520f0302ef3504cee674e48344ed
+  data.tar.gz: 7d996fff12f90c62b9a402342ad4b51265ae2dc59df53cdd9ee3774aabe62b29
 SHA512:
-  metadata.gz: 54363ba53cc8aee04b9fbccee5245e4b975837f1432feffca505ed41d25a7409e067cfb26f26ef4d98348b24fcc8e3110a84f56e8508de38ba81dcd35596c316
-  data.tar.gz: f2cf52f9f6d2d7529de619195a691ba61e55b9c28cbff923a785d128b5255c132d4789b91284b1f952d0d9a685341e786aef1178a14b3796c44e9d2a3bf5d4b3
+  metadata.gz: 5f904d40d4b51ca467ac13455bca0047ead220e2377143b33d610b44479b5d480ca5cec055f4628de2bde86df03711d56c3c65f5bd870b4ea3ad4a0e0a8f4adb
+  data.tar.gz: e653a1d9c5e2656110cb7168e4f825b4a2eb3b4cee951ad1bce2ba574f311f0f65ee800d34eceb61a18458f68b593531d2ccd3dd72fa4b04306cbdf20f542bc4

data/.rubocop.yml

@@ -22,7 +22,7 @@ Metrics/LineLength:
   Max: 175
 
 Metrics/MethodLength:
-  Max: 50
+  Max: 55
 
 Metrics/ParameterLists:
   Max: 12

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## (UNRELEASED)
 
+## 1.9.5 (January 14, 2019)
+
+BUGFIX:
+
+ * Ensure to always re-open Connection to Consul agent in case of network error
+
 ## 1.9.4 (January 11, 2019)
 
 OPTIMIZATIONS:

data/README.md

@@ -31,6 +31,10 @@ with fully [working examples](samples/).
 It also allow to display a very nice and hi-performance HTML5 UI for Consul,
 see [consul-ui](samples/consul-ui) for details.
 
+## Video introduction to consul-templaterb
+
+[![Introduction to Consul-templaterb](docs/images/consul-ui_001.png)](https://youtu.be/zLzrLGLLl4Q)
+
 ## Differences with HashiCorp's consul-template
 
 [Hashicorp's Consul Template](https://github.com/hashicorp/consul-template)

data/lib/consul/async/consul_endpoint.rb

@@ -206,14 +206,16 @@ module Consul
           connect_timeout: 5, # default connection setup timeout
           inactivity_timeout: conf.wait_duration + 1 + (conf.wait_duration / 16), # default connection inactivity (post-setup) timeout
         }
-        connection = EventMachine::HttpRequest.new(conf.base_url, options)
+        connection = {
+          conn: EventMachine::HttpRequest.new(conf.base_url, options)
+        }
         cb = proc do |consul_index|
-          http = connection.get(build_request(consul_index))
+          http = connection[:conn].get(build_request(consul_index))
           http.callback do
             # 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 = EventMachine::HttpRequest.new(conf.base_url, options) }
+              _handle_error(http, consul_index) { connection[:conn] = EventMachine::HttpRequest.new(conf.base_url, options) }
             else
               n_consul_index = find_x_consul_index(http)
               @x_consul_index = n_consul_index.to_i if n_consul_index
@@ -247,7 +249,9 @@ module Consul
 
           http.errback do
             unless @stopping
-              _handle_error(http, consul_index) { connection = EventMachine::HttpRequest.new(conf.base_url, options) }
+              _handle_error(http, consul_index) do
+                connection[:conn] = EventMachine::HttpRequest.new(conf.base_url, options)
+              end
             end
           end
           queue.pop(&cb)

data/lib/consul/async/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul-templaterb
 version: !ruby/object:Gem::Version
-  version: 1.9.4
+  version: 1.9.5
 platform: ruby
 authors:
 - SRE Core Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-11 00:00:00.000000000 Z
+date: 2019-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request
@@ -161,6 +161,7 @@ files:
 - TemplateAPI.md
 - bin/consul-templaterb
 - consul-templaterb.gemspec
+- docs/images/consul-ui_001.png
 - lib/consul/async/consul_endpoint.rb
 - lib/consul/async/consul_template.rb
 - lib/consul/async/consul_template_engine.rb
@@ -232,7 +233,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubyforge_project: 
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Implementation of Consul template using Ruby and .erb templating language