consul-templaterb 1.14.1 → 1.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 19a9fb526bba0cc83b770850eeedca78809be239be8c59389c0bdfc9ddcaa101
-  data.tar.gz: a74807d9c5fff6f2dbf00379fa3cabe737f872d75a40503e05b7e9d8b2a94997
+SHA1:
+  metadata.gz: 5683a9f5392630b3d6579fa02f0f7d29947287a9
+  data.tar.gz: f5f80b967020d8a6ee0e8bfd4b106f369335313c
 SHA512:
-  metadata.gz: 72254dd5e093eb975fab39945b3ba0486473bcca668c955adc7aac56aa421b5b1827c78a50a1173e9949ebfb075235fef83a4ebcf14fccbc24c36aacc8c9019e
-  data.tar.gz: 44d8d212a1fad75022916f5cf64568415ef3f1f1b37baa89f1a4e9680379c34e9eea587f281634032b9df9a4a4254fe1e0210665b591e165e118f7c2c26f0b6d
+  metadata.gz: 942b22b9f18e721dcc36bd085ea324d224492d0e8e9dd0903009d8e04f261238505400a95ca5626ef60751e4d7a78ded148c96c6ed6993f1b40da17930647571
+  data.tar.gz: f3a80693d9302686c78285c5e85103a7085884178849d32954f1c67d85335ead7ec9e2a0cd94c2e9fe849fdc0ba8f8cf2929a51051af8ffea8ecc277eccc8553

data/CHANGELOG.md

@@ -2,11 +2,22 @@
 
 ## (UNRELEASED)
 
+## 1.15.0 (May 14, 2019)
+
+NEW FEATURES
+
+consul-templaterb now returns an error code whether template is malformed.
+This allows to use return code to validate templates when called with `--once`.
+
+IMPROVEMENTS
+
+Do not display ugly stack trace when interrupting program with CRTL-C.
+
 ## 1.14.1 (May 13, 2019)
 
 NEW FEATURES
 
-`endpoint.stats.last_modified` allow to display the date at which the data was last_modified.
+`endpoint.stats.last_modified` allow to display the date at which the data was last modified.
 
 ## 1.14.0 (May 6, 2019)
 

data/bin/consul-templaterb

@@ -254,7 +254,6 @@ def kill_program
     v.kill
   end
   @programs = {}
-  exit 0
 end
 
 optparse.parse!
@@ -298,16 +297,17 @@ end
 Signal.trap('USR1', 'IGNORE') unless Gem.win_platform?
 # Ensure to kill child process if any
 ['EXIT'].each do |sig|
-  Signal.trap(sig) do
-    STDERR.puts "[KILL] received #{sig}, stopping myself"
+  Signal.trap(sig) do |signo|
+    STDERR.puts "[KILL] received #{Signal.signame(signo)}, stopping myself"
     template_manager.terminate
     kill_program
   end
 end
 
-consul_engine.run(template_manager)
-
-# Kill possible child process if consul_engine.run did stop
-kill_program
+begin
+  consul_engine.run(template_manager)
+rescue Interrupt => e
+  STDERR.puts "[WARN] consul-templaterb has been interrupted #{e}"
+end
 
-exit 0
+exit consul_engine.result

data/lib/consul/async/consul_template_engine.rb

@@ -9,7 +9,7 @@ require 'erb'
 module Consul
   module Async
     class ConsulTemplateEngine
-      attr_reader :template_manager, :hot_reload_failure, :template_frequency, :debug_memory
+      attr_reader :template_manager, :hot_reload_failure, :template_frequency, :debug_memory, :result
       attr_writer :hot_reload_failure, :template_frequency, :debug_memory
       def initialize
         @templates = []
@@ -19,6 +19,7 @@ module Consul
         @template_frequency = 1
         @periodic_started = false
         @debug_memory = false
+        @result = 0
         @last_memory_state = build_memory_info
         @start = Time.now
       end
@@ -60,10 +61,12 @@ module Consul
       rescue Consul::Async::InvalidTemplateException => e
         STDERR.puts "[FATAL]#{e}"
         template_manager.terminate
+        @result = 1
         EventMachine.stop
       rescue StandardError => e
         STDERR.puts "[FATAL] Error occured: #{e.inspect} - #{e.backtrace.join("\n\t")}"
         template_manager.terminate
+        @result = 2
         EventMachine.stop
       end
 
@@ -111,6 +114,7 @@ module Consul
             end
           end
         end
+        @result
       end
     end
   end

data/lib/consul/async/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul-templaterb
 version: !ruby/object:Gem::Version
-  version: 1.14.1
+  version: 1.15.0
 platform: ruby
 authors:
 - SRE Core Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-13 00:00:00.000000000 Z
+date: 2019-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request
@@ -242,7 +242,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.6.14.4
 signing_key: 
 specification_version: 4
 summary: Implementation of Consul template using Ruby and .erb templating language