consul-templaterb 1.15.0 → 1.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5683a9f5392630b3d6579fa02f0f7d29947287a9
-  data.tar.gz: f5f80b967020d8a6ee0e8bfd4b106f369335313c
+  metadata.gz: 8b78e19b82cfe21d36bd7985cfb3676bf6eb4adf
+  data.tar.gz: 03fc0513a55921094d962be1f6ec9ae730058244
 SHA512:
-  metadata.gz: 942b22b9f18e721dcc36bd085ea324d224492d0e8e9dd0903009d8e04f261238505400a95ca5626ef60751e4d7a78ded148c96c6ed6993f1b40da17930647571
-  data.tar.gz: f3a80693d9302686c78285c5e85103a7085884178849d32954f1c67d85335ead7ec9e2a0cd94c2e9fe849fdc0ba8f8cf2929a51051af8ffea8ecc277eccc8553
+  metadata.gz: 9991598e1ca634be45e4239b5a279e37dce68413d293a64d68d7b028e103ff0a68895721e92c96adb742bdf623c2184b83fbd2852f44bffb0934fd198be562c2
+  data.tar.gz: c4f9c73248c2c3fcfe170f5dd2a183585400a2ac2bf6f8ee4bdf57a9b5dfcd42d5059eba20af88fbf682706aced1d3fd284da1441f1f6b6d422669665ae63549

data/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 ## (UNRELEASED)
 
+## 1.15.1 (May 14, 2019)
+
+IMPROVEMENTS
+
+Will converge faster if some templates are not always requesting the same paths.
+Intead of relying on key being garbage collected, we now rely whether the key is
+available within the current rendering only.
+It avoid templates never rendering fully when keys appear/disappear.
+
 ## 1.15.0 (May 14, 2019)
 
 NEW FEATURES

data/lib/consul/async/consul_template.rb

@@ -209,16 +209,17 @@ module Consul
       end
 
       def write(file, tpl, last_result, tpl_file_path, params = {}, current_template_info: {})
+        @iteration = Time.now.utc - @start_time
         data = render(tpl, tpl_file_path, params, current_template_info: current_template_info)
         not_ready = []
         ready = 0
-        @iteration = Time.now.utc - @start_time
         to_cleanup = []
         @endpoints.each_pair do |endpoint_key, endpt|
           if endpt.ready?
             ready += 1
           else
-            not_ready << endpt.endpoint.path
+            # We consider only the endpoints usefull with current iteration
+            not_ready << endpoint_key unless endpt.seen_at < @iteration
           end
           to_cleanup << endpoint_key if (@iteration - endpt.seen_at) > 60
         end

data/lib/consul/async/version.rb

@@ -1,5 +1,5 @@
 module Consul
   module Async
-    VERSION = '1.15.0'.freeze
+    VERSION = '1.15.1'.freeze
   end
 end

data/samples/consul-ui/js/service.js

@@ -79,84 +79,85 @@ class ConsulService {
   }
 
   reloadServiceList() {
-    if (!this.data || !this.data.services) {
-      console.log("No data to display");
-    }
     this.serviceList.html('');
     this.serviceFilterCount = 0;
 
     let idx = 0;
     let lastFav = null;
-    for (var serviceName in this.data.services) {
-      var service = this.data.services[serviceName];
-      var serviceStatus = buildServiceStatus(service);
-
-      var listItem = document.createElement('li');
-      listItem.setAttribute('onfocus','consulService.onClickServiceName(this)');
-      listItem.setAttribute('onclick','consulService.onClickServiceName(this)');
-      listItem.setAttribute('value',serviceName);
-      listItem.setAttribute('data-fav', this.favorites[serviceName] ? 1 : 0);
-      listItem.setAttribute('data-index', idx);
-      var listItemClass = 'serviceListItem list-group-item list-group-item-action';
-
-      var statuses = document.createElement('div');
-      statuses.setAttribute('class','statuses float-right');
-
-      if (!!serviceStatus['passing']) {
-        statuses.appendChild(createBadge('badge-success passing', serviceStatus['passing']));
-        listItem.setAttribute('status', 'passing');
-      }
+    if (!this.data || !this.data.services) {
+      console.log("No data to display");
+    } else {
+      for (var serviceName in this.data.services) {
+        var service = this.data.services[serviceName];
+        var serviceStatus = buildServiceStatus(service);
+
+        var listItem = document.createElement('li');
+        listItem.setAttribute('onfocus','consulService.onClickServiceName(this)');
+        listItem.setAttribute('onclick','consulService.onClickServiceName(this)');
+        listItem.setAttribute('value',serviceName);
+        listItem.setAttribute('data-fav', this.favorites[serviceName] ? 1 : 0);
+        listItem.setAttribute('data-index', idx);
+        var listItemClass = 'serviceListItem list-group-item list-group-item-action';
+
+        var statuses = document.createElement('div');
+        statuses.setAttribute('class','statuses float-right');
+
+        if (!!serviceStatus['passing']) {
+          statuses.appendChild(createBadge('badge-success passing', serviceStatus['passing']));
+          listItem.setAttribute('status', 'passing');
+        }
 
-      if (!!serviceStatus['warning']) {
-        statuses.appendChild(createBadge('badge-warning warning', serviceStatus['warning']));
-        listItem.setAttribute('status', 'warning');
-      }
+        if (!!serviceStatus['warning']) {
+          statuses.appendChild(createBadge('badge-warning warning', serviceStatus['warning']));
+          listItem.setAttribute('status', 'warning');
+        }
 
-      if (!!serviceStatus['critical']) {
-        statuses.appendChild(createBadge('badge-danger critical', serviceStatus['critical']));
-        listItem.setAttribute('status', 'critical');
-      }
+        if (!!serviceStatus['critical']) {
+          statuses.appendChild(createBadge('badge-danger critical', serviceStatus['critical']));
+          listItem.setAttribute('status', 'critical');
+        }
 
-      statuses.appendChild(createBadge('badge-dark', (serviceStatus['total'] || 0)));
+        statuses.appendChild(createBadge('badge-dark', (serviceStatus['total'] || 0)));
 
-      statuses.append(this.buildFavButton(serviceName));
+        statuses.append(this.buildFavButton(serviceName));
 
-      listItem.appendChild(statuses);
-      if (!!service['kind']) {
-        var kind = document.createElement('div');
-        kind.setAttribute('class','kind float-right');
-        kind.appendChild(createBadge('badge-info kind', service['kind']));
-        listItem.appendChild(kind);
-        listItemClass+= " kind-" + service['kind'];
-      }
-      listItem.setAttribute('class', listItemClass);
+        listItem.appendChild(statuses);
+        if (!!service['kind']) {
+          var kind = document.createElement('div');
+          kind.setAttribute('class','kind float-right');
+          kind.appendChild(createBadge('badge-info kind', service['kind']));
+          listItem.appendChild(kind);
+          listItemClass+= " kind-" + service['kind'];
+        }
+        listItem.setAttribute('class', listItemClass);
 
-      var serviceNameItem = document.createElement('div');
-      serviceNameItem.setAttribute('class', 'service-name');
-      serviceNameItem.appendChild(document.createTextNode(serviceName));
-      listItem.appendChild(serviceNameItem);
+        var serviceNameItem = document.createElement('div');
+        serviceNameItem.setAttribute('class', 'service-name');
+        serviceNameItem.appendChild(document.createTextNode(serviceName));
+        listItem.appendChild(serviceNameItem);
 
-      var serviceTagsItem = document.createElement('div');
-      serviceTagsItem.setAttribute('class', 'service-tags');
+        var serviceTagsItem = document.createElement('div');
+        serviceTagsItem.setAttribute('class', 'service-tags');
 
-      for (var i = 0; i < service.tags.length; i++) {
-        serviceTagsItem.appendChild(createBadge('float-right badge-' + (i%2?'secondary':'info') , service.tags[i]));
-      }
+        for (var i = 0; i < service.tags.length; i++) {
+          serviceTagsItem.appendChild(createBadge('float-right badge-' + (i%2?'secondary':'info') , service.tags[i]));
+        }
 
-      listItem.appendChild(serviceTagsItem);
-      this.serviceFilterCount += 1;
+        listItem.appendChild(serviceTagsItem);
+        this.serviceFilterCount += 1;
 
-      if (this.favorites[serviceName] && lastFav) {
-        lastFav.after(listItem);
-        lastFav = listItem;
-      } else if (this.favorites[serviceName] && !lastFav) {
-        this.serviceList.prepend(listItem);
-        lastFav = listItem;
-      } else {
-        this.serviceList.append(listItem);
-      }
+        if (this.favorites[serviceName] && lastFav) {
+          lastFav.after(listItem);
+          lastFav = listItem;
+        } else if (this.favorites[serviceName] && !lastFav) {
+          this.serviceList.prepend(listItem);
+          lastFav = listItem;
+        } else {
+          this.serviceList.append(listItem);
+        }
 
-      idx++;
+        idx++;
+      }
     }
     this.serviceFilterCounter.html(this.serviceFilterCount);
     resizeWrapper('service-wrapper', 'service-list');

metadata

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