consul-template-generator 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11a123a605164b3bf85c7d874ae9d731db56cb99
-  data.tar.gz: 9091f83f039d537c0a1b13fac6a99a7546247881
+  metadata.gz: c81f7c798493e55d5de09e72f18774969babccb2
+  data.tar.gz: c8b6ed3a09773848a3c02cd4d97edc1d65c8dfbe
 SHA512:
-  metadata.gz: 4330d15eb334469bad07257f6e66eaaf29dd9f787a652006e9afd9116e714a9d45072c4dce4fbf3fb80d142012f69e0571ac764f349cb39798ad0ae65ff9ca53
-  data.tar.gz: 33406c87edc31d2b4534104bcbbe2a5378690346ca834cadbec809797ab3ad5f7792e9650ff7903c6a00ddf0e0f37c29db140c9506fe496a009c7e1dd51f3d0b
+  metadata.gz: 0c687b4a6fcc7414422484a01083ef65e9f592a0ba55950df4332d56bd9accdd689b62d23f6fbc2069f908a49580925b2440027bd9262ac7f521dbf3dfac5da3
+  data.tar.gz: a30164de62fbaac82dfd7715003fc2db6a5ed1bd8b351e7b31a9aee6ab2569477c05065eede82609914a48cc1e4bdab4523bc2d2f5775abce22b19434aebc352

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    consul-template-generator (0.1.2)
+    consul-template-generator (0.3.0)
       diplomat (~> 0.12.0)
       popen4 (~> 0.1.2)
 

data/lib/consul/template/generator.rb

@@ -42,7 +42,7 @@ module Consul
         end
 
         def create_session(name)
-          Diplomat::Session.create({:Node => self.config.node, :Name => name})
+          Diplomat::Session.create({:Node => self.config.node, :Name => name, :Behavior => 'release'})
         end
 
         def renew_session(sess_id)
@@ -54,7 +54,7 @@ module Consul
             raise ConsulSessionExpired
           rescue Exception => e
             # Letting this go for the time being, until the above issue is fixed
-            self.config.logger.error "Unknown error occoured: #{e.message}"
+            self.config.logger.error "Unknown error occurred: #{e.message}"
           end
         end
 

data/lib/consul/template/generator/cmd.rb

@@ -5,74 +5,81 @@ module Consul
     module Generator
       module CMD
         include Consul::Template::Generator
+        class << self
 
-        def self.configure(consul_host, templates, session_key, log_level, proxy = nil)
-          Consul::Template::Generator.configure do |config|
-            config.log_level = log_level
-            config.templates = templates
-            config.session_key = session_key
-            config.consul_host = consul_host
+          def configure(consul_host, templates, session_key, log_level, proxy = nil)
+            Consul::Template::Generator.configure do |config|
+              config.log_level = log_level
+              config.templates = templates
+              config.session_key = session_key
+              config.consul_host = consul_host
+            end
+            @config = Consul::Template::Generator.config
           end
-        end
 
-        def self.run(cycle_sleep = nil, lock_sleep = nil)
-          cycle_sleep ||= 0.5
-          lock_sleep ||= 1.0
-          config = Consul::Template::Generator.config
-          uploaded_hashes = {}
-          begin
-            runner = CTRunner.new
-            runner.acquire_session_lock do
-              config.logger.info "Session lock acquired..."
-              begin
-                config.templates.each do |template,template_key|
-                  uploaded_hashes[template] = runner.run(template, template_key, uploaded_hashes[template]) || uploaded_hashes[template]
-                  sleep cycle_sleep
-                end
-              rescue Interrupt
-                raise # Re-raise to break this rescue block
-              rescue ConsulSessionExpired
-                config.logger.error "The current consul session has expired."
-                break
-              rescue Exception => e
-                config.logger.error "An error occurred while updating template: #{e.message}"
-                config.logger.debug "Sleeping before attempting to update again..."
-                sleep lock_sleep
-                break
-              end until false
+          def signals
+            Signal.trap("INT") do
+              @config.logger.error "Received INT signal..."
+              @interrupted = true
             end
-          rescue Interrupt
-            config.logger.error "Received interrupt signal, exiting..."
-            break
-          rescue Exception => e
-            config.logger.info "Unable to obtain session lock: #{e.message}"
-            config.logger.debug "Sleeping before attempting lock session again..."
+            Signal.trap("TERM") do
+              @config.logger.error "Received TERM signal..."
+              @terminated = true
+              @interrupted = true
+            end
+          end
+
+          def run(cycle_sleep = nil, lock_sleep = nil)
+            signals
+            @terminated = false
+            cycle_sleep ||= 0.5
+            lock_sleep ||= 1.0
+            uploaded_hashes = {}
+            runner = CTRunner.new nil, false
             begin
+              runner.create_session
+              @interrupted = false
+              runner.acquire_session_lock do
+                @config.logger.info "Session lock acquired..."
+                begin
+                  @config.templates.each do |template,template_key|
+                    uploaded_hashes[template] = runner.run(template, template_key, uploaded_hashes[template]) || uploaded_hashes[template]
+                    sleep cycle_sleep
+                  end
+                rescue ConsulSessionExpired
+                  @config.logger.error "The current consul session has expired."
+                  break
+                rescue Exception => e
+                  @config.logger.error "An error occurred while updating template: #{e.message}"
+                  @config.logger.debug "Sleeping before attempting to update again..."
+                  sleep lock_sleep
+                  break
+                end until @interrupted
+              end
+            rescue Exception => e
+              @config.logger.info "Unable to obtain session lock: #{e.message}"
+              @config.logger.debug "Sleeping before attempting lock session again..."
               sleep lock_sleep
-            rescue Interrupt
-              config.logger.error "Received interrupt signal, exiting..."
-              break
-            end
-          ensure
-            runner.destroy_session
-          end until false
-          0
-        end
+            ensure
+              runner.destroy_session
+            end until @terminated
+            0
+          end
 
-        def self.run_once
-          config = Consul::Template::Generator.config
-          begin
-            config.templates.each do |template,template_key|
-              runner = CTRunner.new
-              result = runner.run template, template_key
+          def run_once
+            begin
+              @config.templates.each do |template,template_key|
+                runner = CTRunner.new
+                result = runner.run template, template_key
+              end
+            rescue Exception => e
+              @config.logger.error "An unexpected error occurred, unable to process template: #{e.message}"
+              1
+            else
+              0
             end
-          rescue Exception => e
-            config.logger.error "An unexpected error occurred, unable to process template: #{e.message}"
-            1
-          else
-            0
-          end 
-        end 
+          end
+        end
       end
     end
   end

data/lib/consul/template/generator/init.rb

@@ -4,8 +4,8 @@ module Consul
       class CTRunner
         attr_accessor :session
 
-        def initialize(consul_session_id = nil)
-          if consul_session_id.nil?
+        def initialize(consul_session_id = nil, do_create_session = true)
+          if (consul_session_id.nil? && do_create_session)
             create_session
           else
             @session = consul_session_id
@@ -17,7 +17,7 @@ module Consul
           unless @session.nil?
             destroy_session
           end
-            @session = Consul::Template::Generator.create_session 'consul-template-generator'
+          @session = Consul::Template::Generator.create_session 'consul-template-generator'
         end
 
         def destroy_session

data/lib/consul/template/generator/version.rb

@@ -1,7 +1,7 @@
 module Consul
   module Template
     module Generator
-      VERSION = '0.2.0'
+      VERSION = '0.3.0'
     end
   end
 end

data/spec/init_spec.rb

@@ -20,7 +20,7 @@ describe 'Consul::Template::Generator::CTRunner' '#initialize' do
       runner = Consul::Template::Generator::CTRunner.new
       expect(runner.session).to eql('test-session-id')
       runner.destroy_session
-      expect(WebMock).to have_requested(:put, 'http://127.0.0.1:8500/v1/session/create').with(:body => '{"Node":"test-node","Name":"consul-template-generator"}')
+      expect(WebMock).to have_requested(:put, 'http://127.0.0.1:8500/v1/session/create').with(:body => '{"Node":"test-node","Name":"consul-template-generator","Behavior":"release"}')
       expect(WebMock).to have_requested(:put, 'http://127.0.0.1:8500/v1/session/destroy/test-session-id')
       expect(runner.session).to be_nil
     end
@@ -30,7 +30,7 @@ describe 'Consul::Template::Generator::CTRunner' '#initialize' do
       expect(runner.session).to eql('destroyed-session')
       runner.create_session
       runner.destroy_session
-      expect(WebMock).to have_requested(:put, 'http://127.0.0.1:8500/v1/session/create').with(:body => '{"Node":"test-node","Name":"consul-template-generator"}')
+      expect(WebMock).to have_requested(:put, 'http://127.0.0.1:8500/v1/session/create').with(:body => '{"Node":"test-node","Name":"consul-template-generator","Behavior":"release"}')
       expect(WebMock).to have_requested(:put, 'http://127.0.0.1:8500/v1/session/destroy/destroyed-session')
       expect(WebMock).to have_requested(:put, 'http://127.0.0.1:8500/v1/session/destroy/test-session-id')
       expect(runner.session).to be_nil
@@ -40,7 +40,7 @@ describe 'Consul::Template::Generator::CTRunner' '#initialize' do
       runner = Consul::Template::Generator::CTRunner.new 'failed-destroyed-session'
       expect(runner.session).to eql('failed-destroyed-session')
       runner.create_session
-      expect(WebMock).to have_requested(:put, 'http://127.0.0.1:8500/v1/session/create').with(:body => '{"Node":"test-node","Name":"consul-template-generator"}')
+      expect(WebMock).to have_requested(:put, 'http://127.0.0.1:8500/v1/session/create').with(:body => '{"Node":"test-node","Name":"consul-template-generator","Behavior":"release"}')
       expect(WebMock).to have_requested(:put, 'http://127.0.0.1:8500/v1/session/destroy/failed-destroyed-session')
       expect(runner.session).to eql('test-session-id')
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul-template-generator
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Brian Oldfield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-27 00:00:00.000000000 Z
+date: 2015-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler