capistrano-consul_kv_lock 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82388f59c13c02e7a7a7aaf521de61fe0a1b986e
-  data.tar.gz: 744e27b8dd823b2372b95fe30648e3365a7772b5
+  metadata.gz: 1faefc322b8e5b7f0b50d750d6b8e891e23fd776
+  data.tar.gz: b2702796331c0bafe1fb3703dee0479abeb2ff48
 SHA512:
-  metadata.gz: aa2e99b389907ef918963bf3a54b2c2830d7381d9abb6e460c2b048b0dc3b8b2c7ea4f8c744a37d919879b9f2e046ef3ffa87294c8dbf13a4723cf02e8cfe74f
-  data.tar.gz: 2510a2a7cd0bf75db7c81705db064dd2aadcb8fd6ce25108e9821e743228d73028b0edc011bddc0ca7305eb6643f61eab0688a24b0496b1911567bd0606eccd0
+  metadata.gz: 5ddd65c39dec7d0b59eb9b6385348fde4a6bd044e4009cc7dae7955e628d5b3d9c76e8bcffb0f6a5c7d274480d38d4f42c645ce8316794da493af529a595ba62
+  data.tar.gz: 27744fca1979c3c2a393f0e3f6b30e899bd6b99622784ae99a8a6dda3702008c38dd3543fcd6effe134be0849a3cfaeecf73b396283da0975cdfd6217b314a0f

data/lib/capistrano/consul_kv_lock.rb

@@ -1,10 +1,5 @@
-require 'capistrano/framework'
-load File.expand_path("../tasks/consul_kv_lock.rake", __FILE__)
-
-module Capistrano
-  module ConsulKvLock
-    # Your code goes here...
-  end
-end
-
+require "capistrano/framework"
+require "capistrano/consul_kv_lock/latch"
 require "capistrano/consul_kv_lock/version"
+
+load File.expand_path("../tasks/consul_kv_lock.rake", __FILE__)

data/lib/capistrano/consul_kv_lock/latch.rb

@@ -0,0 +1,85 @@
+module Capistrano
+  module ConsulKvLock
+    class SSHKittyLogger
+      def initialize
+        @coordinator = SSHKit::Coordinator.new('localhost')
+      end
+
+      %w(debug info warn error fatal).each do |ll|
+        define_method(ll) do |str|
+          @coordinator.each do
+            run_locally { self.send(ll, "[consul-client] #{str}") }
+          end
+        end
+      end
+    end
+
+    class Latch
+      def self.set_instance(consul_url, options={})
+        @_instance ||= p(new(consul_url, options))
+      end
+
+      def self.instance
+        @_instance
+      end
+
+      def initialize(consul_url, options={})
+        @logger = SSHKittyLogger.new
+        @client = begin
+                   consul = URI.parse(consul_url)
+                   Consul::Client.v1.http(host: consul.host, port: consul.port, logger: @logger)
+                  end
+        @lock_key = options[:consul_lock_key] || 'deployment/locked'
+        @session_id = nil
+      end
+      attr_reader :client, :lock_key
+
+      def session_request
+        {
+          "LockDelay" => 15,
+          "Name" => "lock-for-#{lock_key.tr("/", "-")}",
+        }
+      end
+
+      def locked?
+        r = client.get("/kv/#{lock_key}")
+        !!(Base64.decode64(r[0]['Value']) =~ /\A["'](t(rue)?|1|y(es)?)["']\z/)
+      rescue Consul::Client::ResponseException => e
+        # in case of 404
+        if e.message.include?('404')
+          return false
+        else
+          raise e
+        end
+      end
+
+      def create_session
+        @logger.debug "Session request: #{session_request.inspect}"
+        r = client.put("/session/create", session_request)
+        @session_id = r['ID']
+      end
+
+      def delete_session
+        with_session {
+          client.put("/session/destroy/#{@session_id}", "")
+        }
+        @session_id = nil
+      end
+
+      def lock
+        with_session { client.put("/kv/#{lock_key}?acquire=#{@session_id}", "true") }
+      end
+
+      def unlock
+        with_session { client.put("/kv/#{lock_key}?release=#{@session_id}", "false") }
+      end
+
+      private
+      def with_session &blk
+        return false unless @session_id
+        blk.call
+        return true
+      end
+    end
+  end
+end

data/lib/capistrano/consul_kv_lock/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module ConsulKvLock
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
   end
 end

data/lib/capistrano/tasks/consul_kv_lock.rake

@@ -4,68 +4,51 @@ require 'base64'
 require 'consul/client'
 
 namespace :consul_kv_lock do
-  class SSHKittyLogger
-    def initialize
-      @coordinator = SSHKit::Coordinator.new('localhost')
-    end
-
-    %w(debug info warn error fatal).each do |ll|
-      define_method(ll) do |str|
-        @coordinator.each do
-          run_locally { self.send(ll, "[consul-client] #{str}") }
-        end
-      end
-    end
+  def latch
+    Capistrano::ConsulKvLock::Latch.instance || \
+      Capistrano::ConsulKvLock::Latch.set_instance(fetch(:consul_url), consul_lock_key: fetch(:consul_lock_key))
   end
 
-  def client
-    @_client ||= begin
-                   consul = URI.parse(fetch(:consul_url))
-                   Consul::Client.v1.http(host: consul.host, port: consul.port, logger: SSHKittyLogger.new)
-                 end
-  end
-
-  def lock_key
-    fetch(:consul_lock_key)
+  task :check_lock do
+    if latch.locked?
+      fail("Deployment is locked!")
+    end
   end
 
-  def locked?
-    r = client.get("/kv/#{lock_key}")
-    !!(Base64.decode64(r[0]['Value']) =~ /\A["'](t(rue)?|1|y(es)?)["']\z/)
-  rescue Consul::Client::ResponseException => e
-    # in case of 404
-    if e.message.include?('404')
-      return false
-    else
-      raise e
-    end
+  task :start_session do
+    latch.create_session
   end
 
-  task :check_lock do
-    if locked?
-      fail("Deployment is locked!")
-    end
+  task :destroy_session do
+    latch.delete_session
   end
 
   task :lock do
     run_locally do
       info("Setting lock to #{fetch(:consul_url)}")
-      client.put("/kv/#{lock_key}", "true")
+      unless latch.lock
+        warn("Setting lock to #{fetch(:consul_url)} failed! Skipping.")
+      end
     end
   end
 
   task :unlock do
     run_locally do
       info("Deleting lock from #{fetch(:consul_url)}")
-      client.put("/kv/#{lock_key}", "false")
+      unless latch.unlock
+        warn("Deleting lock from #{fetch(:consul_url)} failed! Skipping.")
+      end
     end
   end
 end
 
 before 'deploy:starting', 'consul_kv_lock:lock'
-before 'consul_kv_lock:lock', 'consul_kv_lock:check_lock'
+before 'consul_kv_lock:lock', 'consul_kv_lock:start_session'
+before 'consul_kv_lock:start_session', 'consul_kv_lock:check_lock'
+
 after  'deploy:finished', 'consul_kv_lock:unlock'
 after  'deploy:failed', 'consul_kv_lock:unlock'
+after  'consul_kv_lock:unlock', 'consul_kv_lock:destroy_session'
 
 namespace :load do
   task :defaults do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-consul_kv_lock
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Uchio KONDO
@@ -82,6 +82,7 @@ files:
 - capistrano-consul_kv_lock.gemspec
 - lib/capistrano-consul_kv_lock.rb
 - lib/capistrano/consul_kv_lock.rb
+- lib/capistrano/consul_kv_lock/latch.rb
 - lib/capistrano/consul_kv_lock/version.rb
 - lib/capistrano/tasks/consul_kv_lock.rake
 homepage: https://github.com/udzura/capistrano-consul_kv_lock