consul-template-generator 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: c81f7c798493e55d5de09e72f18774969babccb2
-  data.tar.gz: c8b6ed3a09773848a3c02cd4d97edc1d65c8dfbe
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ODY5MTY5NmE1MWZjZTUxZDNmYWQ0NjA5M2FjYjEzNzU1NTBiMTM4OA==
+  data.tar.gz: !binary |-
+    YTFmNGE4OWRjNDQ5MDgyOTAyY2QwOTU4MTg2ZmNiM2IxMjg5NjE3Ng==
 SHA512:
-  metadata.gz: 0c687b4a6fcc7414422484a01083ef65e9f592a0ba55950df4332d56bd9accdd689b62d23f6fbc2069f908a49580925b2440027bd9262ac7f521dbf3dfac5da3
-  data.tar.gz: a30164de62fbaac82dfd7715003fc2db6a5ed1bd8b351e7b31a9aee6ab2569477c05065eede82609914a48cc1e4bdab4523bc2d2f5775abce22b19434aebc352
+  metadata.gz: !binary |-
+    ZTFjMDM4ZDc3OTU5NmQ3ZDIyNGQ1ODMyZjY5OGQxYmYwMmM0NzMwODdmMjQw
+    MzUxOTNlMDdkMDAxODJhYjg2MTVlMTgzMDFhMTgyYTcwZWRkMjQ2MGU3MWNm
+    ZTkwZTJkYWQ5NTJlZGQ1ZmU3MzY5ZGM3NzY1NDIxYzY0MjBlOTE=
+  data.tar.gz: !binary |-
+    NjY0NTliM2E5NDVkZTIzZTZjZjJhNjkzZGQ0ZGIwYTk2ZWZiNDU3ZGQwODM2
+    ZGI3MGYwYWMzZDZmMDlkNWZiOGJjZjc2MmE1NzY1NTdhNmRjNmY5OTVkMzcy
+    NTA5NjI4MjZmMjRlZWI3OGFkMTI0MzI4Mjk5YTRmNzEzMDBiYmM=

data/lib/consul/template/generator.rb

@@ -59,7 +59,7 @@ module Consul
         end
 
         def destroy_session(sess_id)
-          Diplomat::Session.destroy sess_id
+          'true' == Diplomat::Session.destroy(sess_id)
         end
       end
     end

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

@@ -17,7 +17,7 @@ module Consul
             @config = Consul::Template::Generator.config
           end
 
-          def signals
+          def configure_signal_handlers
             Signal.trap("INT") do
               @config.logger.error "Received INT signal..."
               @interrupted = true
@@ -30,7 +30,7 @@ module Consul
           end
 
           def run(cycle_sleep = nil, lock_sleep = nil)
-            signals
+            configure_signal_handlers
             @terminated = false
             cycle_sleep ||= 0.5
             lock_sleep ||= 1.0

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

@@ -59,6 +59,10 @@ module Consul
         def session_lock_key
           @session_key
         end
+
+        def session_name
+          @session_key.split('/')[-1]
+        end
       end
     end
   end

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

@@ -5,28 +5,34 @@ module Consul
         attr_accessor :session
 
         def initialize(consul_session_id = nil, do_create_session = true)
+          @config = Consul::Template::Generator.config
           if (consul_session_id.nil? && do_create_session)
             create_session
           else
             @session = consul_session_id
           end
-          @config = Consul::Template::Generator.config
         end
 
         def create_session
           unless @session.nil?
             destroy_session
           end
-          @session = Consul::Template::Generator.create_session 'consul-template-generator'
+          @session = Consul::Template::Generator.create_session @config.session_name
         end
 
         def destroy_session
+          attempts = 0
           begin
-            Consul::Template::Generator.destroy_session @session
+            destroyed = Consul::Template::Generator.destroy_session @session
           rescue
-            Consul::Template::Generator.config.logger.info "Failed to destroy session: #{@session}"
-          end
-          @session = nil
+            Consul::Template::Generator.config.logger.info "Failed to destroy session: #{@session}, attempt number #{attempts}"
+          ensure
+            @session = destroyed ? nil : @session
+            unless @session.nil?
+              attempts += 1
+              sleep 0.25
+            end
+          end until (destroyed || attempts > 4)
         end
       end
     end

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

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

data/spec/init_spec.rb

@@ -11,6 +11,7 @@ describe 'Consul::Template::Generator::CTRunner' '#initialize' do
       config.templates = {'test-session-template.ctmpl' => 'test-session-template' }
       config.node = 'test-node'
       config.log_level = :off
+      config.session_key = '/session/consul-template-generator'
       config.consul_template_binary = 'consul-template'
     end
   end
@@ -41,7 +42,7 @@ describe 'Consul::Template::Generator::CTRunner' '#initialize' do
       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","Behavior":"release"}')
-      expect(WebMock).to have_requested(:put, 'http://127.0.0.1:8500/v1/session/destroy/failed-destroyed-session')
+      expect(WebMock).to have_requested(:put, 'http://127.0.0.1:8500/v1/session/destroy/failed-destroyed-session').times(5)
       expect(runner.session).to eql('test-session-id')
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul-template-generator
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Brian Oldfield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-28 00:00:00.000000000 Z
+date: 2015-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -180,12 +180,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -201,4 +201,3 @@ test_files:
 - spec/key_value_spec.rb
 - spec/run_spec.rb
 - spec/spec_helper.rb
-has_rdoc: