capistrano-jetty 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18db6148f4f9a0dca482e3d115ed40dab24a86da
-  data.tar.gz: c570808dfb60925d1b1f9184ba06bf54f737cee3
+  metadata.gz: 596c19c36bf825e67148b4c38f2068e70c4b16d1
+  data.tar.gz: af4440784fa0b86026eea228974e1130e9dd5c60
 SHA512:
-  metadata.gz: 8bd2d284a294b05f2b952b16409cc423fb3544e11fbd648029daa2eb57ee91491c10a645312f994b4ecf9419eb0379daba6a167f961f9c2ff53f4e0eb2f55888
-  data.tar.gz: ccb123a5108f1398c804b8d8fe86b6d8fd2d8ed9d0ae0c7157a3a69334c529b9c9d666a0b90883f784f3ca0dd2f93bf9c8df53494433ba6a3412597c34410e19
+  metadata.gz: d9650c3e06c0aeac2e00c59b23e54a7e3b8100dac5fb03289e63d85751d9b8ca69b4b89bace4d9fe2f70fb48ffe742c11961e4d937070e46dcdf37196a24f3a0
+  data.tar.gz: 0b7c447b8a1c3679be6736627b69e5e504b4ef43b9348c7717ec056ed962dc25c218c065d8781e4875e418a5d981ad887872895eb4b4c4c0b7a1182feeaad184

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 This is the Changelog for Capistrano::Jetty.
 
+## v1.2.0 (2014-06-09)
+
+* Refactor deployment to be zero-downtime courtesy of evertrue/et_haproxy-cookbook@v3.1.0
+
 ## v1.1.0 (2014-02-13)
 
 * Add validation to check for necessary Capistrano variables

data/capistrano-jetty.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'capistrano-jetty'
-  spec.version       = '1.1.0'
+  spec.version       = '1.2.0'
   spec.authors       = ['Jeff Byrnes']
   spec.email         = ['jeff@evertrue.com']
   spec.summary       = %q{Capistrano 3 plugin for handling Jetty.}

data/lib/capistrano-jetty/tasks/jetty.rake

@@ -3,8 +3,13 @@ namespace :deploy do
     on release_roles :all do
       deployed_artifact_filename = fetch(:deployed_artifact_filename)
       jetty_webapps_path         = fetch(:jetty_webapps_path)
+      load_balancer_backend      = fetch(:load_balancer_backend)
 
-      %w(deployed_artifact_filename jetty_webapps_path).each do | var_name |
+      %w(
+        deployed_artifact_filename
+        jetty_webapps_path
+        load_balancer_backend
+      ).each do | var_name |
         var = eval(var_name)
 
         if var.nil?
@@ -16,22 +21,44 @@ namespace :deploy do
     end
   end
 
-  desc 'Grab the latest artifact from the release_path'
-  task :update_webapps do
-    on roles(:app) do
-      execute :cp, "#{release_path}/#{fetch(:deployed_artifact_filename)}",
+  desc 'Rotate servers out of HAProxy pool, stop Jetty, deploy artifact, ' \
+       'restart Jetty, rotate server back into HAProxy pool'
+  task :rolling_restart do
+    on roles(:app), in: :sequence, wait: 5 do |server|
+      current_app_server = server.hostname
+
+      on roles(:load_balancer) do
+        execute(
+          :sudo,
+          '/usr/local/bin/haproxyctl',
+          'disable server',
+          "#{fetch(:load_balancer_backend)}/#{current_app_server}"
+        )
+      end
+
+      sleep 3
+
+      execute :sudo, :service, 'jetty', 'stop'
+
+      execute(
+        :cp,
+        "#{release_path}/#{fetch(:deployed_artifact_filename)}",
         "#{fetch(:jetty_webapps_path)}/#{fetch(:deployed_artifact_filename)}"
-    end
-  end
+      )
 
-  desc 'Restart Jetty'
-  task :restart do
-    on roles(:app), in: :sequence, wait: 5 do
-      execute :sudo, :service, 'jetty', 'restart'
+      execute :sudo, :service, 'jetty', 'start'
+
+      on roles(:load_balancer) do
+        execute(
+          :sudo,
+          '/usr/local/bin/haproxyctl',
+          'enable server',
+          "#{fetch(:load_balancer_backend)}/#{current_app_server}"
+        )
+      end
     end
   end
 
   before 'deploy:check', 'deploy:validate'
-  before 'deploy:published', 'deploy:update_webapps'
-  after 'deploy:published', 'deploy:restart'
+  after 'deploy:publishing', 'deploy:rolling_restart'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-jetty
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Jeff Byrnes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-13 00:00:00.000000000 Z
+date: 2015-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -91,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Capistrano 3 plugin for handling Jetty.