Merge pull request #79 from mougams/fix_consul_lock

Fix consul lib semaphore

Author: jlundqvist-criteo

libraries/consul.rb

@@ -19,12 +19,12 @@ def self.setup_consul(options)
       end
     end
 
-    def self.update_backup_url(options)
+    def self.update_backup_url(consul_backup_url: nil)
       require 'diplomat'
-      return unless options[:consul_backup_url]
+      return if consul_backup_url.nil?
 
       Diplomat.configure do |config|
-        config.url = options[:consul_backup_url]
+        config.url = consul_backup_url
       end
     end
 

libraries/primitive_consul_lock.rb

@@ -51,7 +51,7 @@ def semaphore_class
 
     def semaphore
       # this object cannot be reused after enter/exit
-      semaphore_class.get_or_create(path, concurrency: concurrency, dc: @options[:datacenter], token: @options[:token])
+      semaphore_class.get_or_create(path, concurrency: concurrency, dc: @options[:datacenter], token: @options[:token], consul_backup_url: @options[:consul_backup_url])
     end
 
     def backoff(start_time, current_try)
@@ -129,7 +129,7 @@ def self.get_or_create(path, concurrency:, **kwargs)
         Chef::Log.info "Consul did not respond, wait #{retry_secs} seconds and retry to let it (re)start: #{e}"
         sleep retry_secs
         connection_failed_count += 1
-        ConsulCommon.update_backup_url(@options) if connection_failed_count == retry_total_attempts / 2
+        ConsulCommon.update_backup_url(kwargs[:consul_backup_url]) if connection_failed_count == retry_total_attempts / 2
         (retry_left -= 1).positive? ? retry : raise
       rescue Diplomat::KeyNotFound
         Chef::Log.info "Lock for #{path} did not exist, creating with value #{value}"

spec/unit/primitive_consul_lock_spec.rb

@@ -62,7 +62,7 @@
       lock = double('lock')
       expect(lock).to receive(:enter).with(name: 'my_node').and_return(true)
 
-      expect(Semaphore).to receive(:get_or_create).with('chef_lock/test', concurrency: 3, dc: nil, token: nil).and_return(lock)
+      expect(Semaphore).to receive(:get_or_create).with('chef_lock/test', concurrency: 3, dc: nil, token: nil, consul_backup_url: nil).and_return(lock)
 
       choregraphie_service.before.each(&:call)
     end