capistrano-sozo_magento2 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 923ebdbd8e0af793979bc643b64dcf620b6a41339e7a0a37fd1493d4c0ebe394
-  data.tar.gz: 96129ba2ee73f1f05a3e920676b8b70ed3dc1b0a2e70e500c31c19c0f75cfca1
+  metadata.gz: 30ddb4232948b060b40cd21385c277fa47f3f047838b461320638b8a46a7fa72
+  data.tar.gz: 483615f92d6c6f94088702fad14bed24ed4048cd583a0bde96b2182dea144954
 SHA512:
-  metadata.gz: 0a084753174d86a81c8af5fa6b4b6334121688f924cddabdb0107f34012d09db7a6106531e058de9fc833a256170f18f23597a1cb640cde3ab94f345e07991c5
-  data.tar.gz: 8b2e192b898f69a731df2f1e38a1fcd83bd01691eefe336cb88e848a00957043d8432919827c09e8248dca394a36ef7b736ff1f8aadae7541edca3075bfc4b49
+  metadata.gz: 1c9408af646a0cebe70f06de570403d5ffb40be9fb292c957d638abdc26619454c7c1192c2ec01f44fcde9c563b1e3f682bb6c4fedf5668286aebb40b6cca159
+  data.tar.gz: 28af1de39d23d75249378353572187456f9f5902a073ee1252fa947684da126a050080a5ffae30458f7edf44b421e67b330b3d09de775d37cd766f3a595bb0f8

data/CHANGELOG.md

@@ -21,6 +21,11 @@ Given a version number MAJOR.MINOR.PATCH, increment the:
 
 ## [Unreleased]
 
+## [v1.8.0] - 2022-10-14
+### Added
+- varnish role added to restart varnish service
+- Ability to completely clear long running cron tasks to stop multiple crons running simultaneously
+
 
 ## [v1.7.0] - 2022-09-22
 ### Changed

data/README.md

@@ -7,7 +7,7 @@ It is advised to use bundler.
 
 1. Add the following to your projects `Gemfile`
 ```
-gem "capistrano-sozo_magento2", "~> 1.6"
+gem "capistrano-sozo_magento2", "~> 1.8"
 ```
 2. Install
 ```
@@ -77,6 +77,7 @@ SSHKit.config.command_map[:php] = '/usr/bin/env php74 -dmemory_limit=-1'
 SSHKit.config.command_map[:composer] = SSHKit.config.command_map[:php], '-f /usr/local/bin/composer'
 SSHKit.config.command_map[:n98magerun] = SSHKit.config.command_map[:php], '-f /usr/local/bin/n98-magerun'
 SSHKit.config.command_map[:magento] = SSHKit.config.command_map[:php], '-f bin/magento --'
+SSHKit.config.command_map[:app_controller] = 'sudo /usr/bin/systemctl'
 ```
 
 ## Versioning

data/lib/capistrano/sozo_magento2/defaults.rb

@@ -45,6 +45,7 @@ set :magento_deploy_confirm_roles,  fetch(:magento_deploy_confirm_roles, [])
 
 # Handle removing and installing of cron tasks?
 set :handle_cron,                   fetch(:handle_cron, false)
+set :clear_cron,                    fetch(:clear_cron, false)
 
 # Other defaults (for future use)
 # Clear or leave the failed deployment dirs

data/lib/capistrano/sozo_magento2/info.rb

@@ -12,6 +12,7 @@ module SozoMagento2
                 branch
                 environment
                 handle_cron
+                clear_cron
                 slack_channel
                 url
               ).freeze

data/lib/capistrano/sozo_magento2/version.rb

@@ -4,6 +4,6 @@ module Capistrano
     module SozoMagento2
         # The plugin version number
         # @return [String] The gem version number
-        VERSION = "1.7.0"
+        VERSION = "1.8.0"
     end
 end

data/lib/capistrano/sozo_magento2.rb

@@ -4,6 +4,7 @@ SSHKit.config.command_map[:php] = '/usr/bin/env php -dmemory_limit=-1'
 SSHKit.config.command_map[:composer] = SSHKit.config.command_map[:php], '-f /usr/local/bin/composer'
 SSHKit.config.command_map[:n98magerun] = SSHKit.config.command_map[:php], '-f /usr/local/bin/n98-magerun'
 SSHKit.config.command_map[:magento] = SSHKit.config.command_map[:php], '-f bin/magento --'
+SSHKit.config.command_map[:app_controller] = 'sudo /usr/bin/systemctl'
 
 load File.expand_path('../tasks/sozo_magento2.rake', __FILE__)
 load File.expand_path('../tasks/deploy.rake', __FILE__)
@@ -15,6 +16,7 @@ load File.expand_path('../tasks/magento2.rake', __FILE__)
 load File.expand_path('../tasks/provision.rake', __FILE__)
 load File.expand_path('../tasks/server.rake', __FILE__)
 load File.expand_path('../tasks/wordpress.rake', __FILE__)
+load File.expand_path('../tasks/cron.rake', __FILE__)
 
 after 'deploy:check', 'sozo:git:check'
 after 'deploy:check', 'sozo:info'

data/lib/capistrano/tasks/cron.rake

@@ -0,0 +1,27 @@
+namespace :cron do
+    desc 'Cleanup cron tasks that shouldn\'t be running'
+    task :cleanup do
+        on release_roles :all do
+            if (fetch(:clear_cron).to_s == "true")
+                info "Stopping cron daemon"
+                execute :app_controller, "stop", "crond"
+
+                info "Killing current cron tasks"
+                execute :sudo, "pkill", "-u", "#{fetch(:username)}", "-f", "'cron|consumer'", "||", "true"
+
+                within fetch(:deploy_root) + '/magento2/' do
+                    info "Removing Magento cron tasks"
+                    execute :rm, "-rf", "var/cron/*"
+
+                    info "Truncating cron_schedule table"
+                    execute :n98magerun, "db:query", '"truncate cron_schedule;"'
+                end
+                
+                info "Starting cron daemon"
+                execute :app_controller, "start", "crond"
+            else
+                info "Cron Clear not controlled by capistrano"
+            end
+        end
+    end
+end

data/lib/capistrano/tasks/magento2.rake

@@ -10,6 +10,7 @@ namespace :magento do
                 else
                     info "Cron not controlled by capistrano"
                 end
+                invoke 'cron:cleanup'
             end
         end
 

data/lib/capistrano/tasks/server.rake

@@ -2,10 +2,15 @@ namespace :server do
     namespace :service do
         desc "Restart the server services"
         task :restart do
+            on roles(:varnish) do
+                within release_path do
+                    execute :app_controller, "restart", "varnish"
+                end
+            end
             on roles(:gcloud, :aws, :cloud, :dedicated) do
                 within release_path do
-                    execute :sudo, "systemctl", "restart", "php-fpm"
-                    execute :sudo, "systemctl", "restart", "nginx"
+                    execute :app_controller, "restart", "php-fpm"
+                    execute :app_controller, "restart", "nginx"
                 end
             end
             on roles(:cluster) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-sozo_magento2
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Clive Walkden
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-22 00:00:00.000000000 Z
+date: 2022-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -45,6 +45,7 @@ files:
 - lib/capistrano/sozo_magento2/slack.rb
 - lib/capistrano/sozo_magento2/version.rb
 - lib/capistrano/tasks/composer.rake
+- lib/capistrano/tasks/cron.rake
 - lib/capistrano/tasks/db.rake
 - lib/capistrano/tasks/deploy.rake
 - lib/capistrano/tasks/magento2.rake