consul-templaterb 1.6.3 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6f2b125d1d399813f7fe9ce1233034d077b514d0e27fa23c8134dd0d27a80df
-  data.tar.gz: 4c35fdf085bcbe8d21d9df515f749e0e19d75270cdefe8e21b742e4ef7775e82
+  metadata.gz: d5b4bfc2f950af28c0c5db345700d15cdf01076cab18efea784e6ad6d1329e81
+  data.tar.gz: 725e4f3abcae9d3891b6956547dbb94a1c35beb3c810a34d2e8ade1f59e6f47c
 SHA512:
-  metadata.gz: 321da736b94e7fb8fbcc203cd778089d6a5e48148bf35eb09ad8d301682f1e91733e5d2cfc473672df3bb0e035112f08f6e328a83981db32cdc0ef723836dac2
-  data.tar.gz: 43d74d35bf97ece9e77ba32e52ee875e55024393b296b50310e287d521d276d5ed0a51379d8f77e7a6f22e684c89a055ac0658d3f5aa69959be88171eea7cf01
+  metadata.gz: 10f434a98600c5d2613fd6cfc1c195ed2344a2f9c4929d8fe8625815b9cd9ec086452e10cfbb55d6be9645fc81bd967d9556f40da7e408adb2d52089b260da7a
+  data.tar.gz: c2ba837aced1ca0db90480b4deb91dffafa0fa5f621ac9f9161e557d25e7ad580fee23f6bbd04fbe2759d2df9f7c75578725d4d50389ab71fd19c246e84dc13b

data/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 ## (UNRELEASED)
 
+## 1.7.0 (December 7, 2018)
+
+OPTIMIZATIONS:
+
+ * Improved startup time (especially useful with `--once` option)
+ * Now iterate as fast as possible until scheduled rendering has started, so rendering is way faster
+
+BUG FIXES:
+
+ * --wait was not working as expected, no properly set the minimum time between templates generation
+
 ## 1.6.3 (December 4, 2018)
 
 BUG FIXES:

data/bin/consul-templaterb

@@ -118,8 +118,9 @@ optparse = OptionParser.new do |opts|
     options[:vault][:lease_duration_factor] = factor
   end
 
-  opts.on('-w', '--wait=<min_duration>', Float, 'Wait at least n seconds before each template generation') do |min_duration|
-    options[:consul][:min_duration] = min_duration
+  opts.on('-w', '--wait=<min_duration>', Integer, 'Wait at least n seconds before each template generation') do |min_duration|
+    raise "--wait=#{min_duration} must be greater than 0" unless min_duration.positive?
+    consul_engine.template_frequency = min_duration
   end
 
   opts.on('-r', '--retry-delay=<min_duration>', Float, 'Min Retry delay on Error/Missing Consul Index') do |min_duration|

data/lib/consul/async/consul_template_engine.rb

@@ -9,13 +9,15 @@ require 'erb'
 module Consul
   module Async
     class ConsulTemplateEngine
-      attr_reader :template_manager, :hot_reload_failure
-      attr_writer :hot_reload_failure
+      attr_reader :template_manager, :hot_reload_failure, :template_frequency
+      attr_writer :hot_reload_failure, :template_frequency
       def initialize
         @templates = []
         @template_callbacks = []
         @hot_reload_failure = 'die'
         @all_templates_rendered = false
+        @template_frequency = 1
+        @periodic_started = false
       end
 
       def add_template_callback(&block)
@@ -26,6 +28,43 @@ module Consul
         @templates.push([source, dest, params])
       end
 
+      # Run templating engine once
+      def do_run(template_manager, template_renders)
+        results = template_renders.map(&:run)
+        all_ready = results.reduce(true) { |a, e| a && e.ready? }
+        if !@all_templates_rendered && all_ready
+          @all_templates_rendered = true
+          STDERR.puts "[INFO] First rendering of #{results.count} templates completed"
+        end
+        begin
+          @template_callbacks.each do |c|
+            c.call([all_ready, template_manager, results])
+          end
+        rescue StandardError => cbk_error
+          STDERR.puts "[ERROR] callback error: #{cbk_error.inspect}"
+          raise cbk_error
+        end
+      rescue Consul::Async::InvalidTemplateException => e
+        STDERR.puts "[FATAL]#{e}"
+        template_manager.terminate
+        EventMachine.stop
+      rescue StandardError => e
+        STDERR.puts "[ERROR] Fatal error occured: #{e.inspect} - #{e.backtrace.join("\n\t")}"
+        template_manager.terminate
+        EventMachine.stop
+      end
+
+      # Run template engine as fast as possible until first rendering occurs
+      def do_run_fast(template_manager, template_renders)
+        do_run(template_manager, template_renders)
+
+        return if @all_templates_rendered || @periodic_started
+        # We continue if rendering not done and periodic not started
+        EventMachine.next_tick do
+          do_run_fast(template_manager, template_renders)
+        end
+      end
+
       def run(template_manager)
         @template_manager = template_manager
         EventMachine.run do
@@ -35,31 +74,13 @@ module Consul
                                                                         hot_reload_failure: hot_reload_failure,
                                                                         params: params)
           end
-          EventMachine.add_periodic_timer(1) do
-            begin
-              results = template_renders.map(&:run)
-              all_ready = results.reduce(true) { |a, e| a && e.ready? }
-              if !@all_templates_rendered && all_ready
-                @all_templates_rendered = true
-                STDERR.puts "[INFO] First rendering of #{results.count} templates completed"
-              end
-              begin
-                @template_callbacks.each do |c|
-                  c.call([all_ready, template_manager, results])
-                end
-              rescue StandardError => cbk_error
-                STDERR.puts "[ERROR] callback error: #{cbk_error.inspect}"
-                raise cbk_error
-              end
-            rescue Consul::Async::InvalidTemplateException => e
-              STDERR.puts "[FATAL]#{e}"
-              template_manager.terminate
-              EventMachine.stop
-            rescue StandardError => e
-              STDERR.puts "[ERROR] Fatal error occured: #{e.inspect} - #{e.backtrace.join("\n\t")}"
-              template_manager.terminate
-              EventMachine.stop
-            end
+          # Initiate first run immediately to speed up rendering
+          EventMachine.next_tick do
+            do_run_fast(template_manager, template_renders)
+          end
+          EventMachine.add_periodic_timer(template_frequency) do
+            @periodic_started = true
+            do_run(template_manager, template_renders)
           end
         end
       end

data/lib/consul/async/version.rb

@@ -1,5 +1,5 @@
 module Consul
   module Async
-    VERSION = '1.6.3'.freeze
+    VERSION = '1.7.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul-templaterb
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.7.0
 platform: ruby
 authors:
 - SRE Core Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-04 00:00:00.000000000 Z
+date: 2018-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request