capistrano-sidekiq 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f55ede23a48a3ff9319774a09692f01137ae02ef54b6f27bead18518650973c
-  data.tar.gz: 3587deeffde5524d5390e0fc60e474c0bf1c34c048422a15a30efc8cb5460ca2
+  metadata.gz: f1305b19a72ddd0258d9802bb785bf4b35b8a365341ace29cc7f13a73b48e275
+  data.tar.gz: fb3d6649a6d38017d246b029b724054d19ab1121a5290cfc059435c49d71f1b8
 SHA512:
-  metadata.gz: 46b1223d92a931beed504100ed25debb4c1b5d0a98a0e60b279c0d283ac5356a5ed5c3d80b87dbe8220cc8faa60999ab3d1266147ff22d1968b8545e313a1f00
-  data.tar.gz: da0d5e2e30b0fefc4a1e37beae281bbbba52417fa4446f13bcff69bb395df9250945797f76a039ae5774574d24ca7b2d563c2f4013fa8726faaa00b3d66c857a
+  metadata.gz: f785e552f7e6d5ae48239cad1190450d153340bcbeb4b00128a5ef26f809561b0cd638e759221f9dfda2916812a60071ca597ab54a58b7973894777df2465baf
+  data.tar.gz: b59f3805ca7517b3b7378f05dd924c9135eb5cca57475b2b538d50ed0c379be383a2ec4cc8bf666e3d72cbb846df5fd5ace2d8f4262aeffc722b7082c2613760

data/.tool-versions

@@ -1 +1 @@
-ruby 3.1.2
+ruby 2.7.6

data/CHANGELOG.md

@@ -1,8 +1,18 @@
 # Changelog
 
-## [2.2.0](https://github.com/seuros/capistrano-sidekiq/tree/2.2.0) (2022-05-16)
+## [2.3.0](https://github.com/seuros/capistrano-sidekiq/tree/2.3.0) (2022-05-17)
 
-[Full Changelog](https://github.com/seuros/capistrano-sidekiq/compare/v2.1.0...2.2.0)
+[Full Changelog](https://github.com/seuros/capistrano-sidekiq/compare/v2.2.0...2.3.0)
+
+**Merged pull requests:**
+
+- fix sidekiq processes naming when count is 1 [\#300](https://github.com/seuros/capistrano-sidekiq/pull/300) ([seuros](https://github.com/seuros))
+- Support multiple processes in `sidekiq:install` [\#299](https://github.com/seuros/capistrano-sidekiq/pull/299) ([lloydwatkin](https://github.com/lloydwatkin))
+- fix: monit config template [\#288](https://github.com/seuros/capistrano-sidekiq/pull/288) ([jpickwell](https://github.com/jpickwell))
+
+## [v2.2.0](https://github.com/seuros/capistrano-sidekiq/tree/v2.2.0) (2022-05-16)
+
+[Full Changelog](https://github.com/seuros/capistrano-sidekiq/compare/v2.1.0...v2.2.0)
 
 **Merged pull requests:**
 
@@ -270,3 +280,7 @@
 - More robust version checking [\#4](https://github.com/seuros/capistrano-sidekiq/pull/4) ([jlecour](https://github.com/jlecour))
 - More explicit start command [\#3](https://github.com/seuros/capistrano-sidekiq/pull/3) ([jlecour](https://github.com/jlecour))
 - Improve pid and log files settings [\#1](https://github.com/seuros/capistrano-sidekiq/pull/1) ([jlecour](https://github.com/jlecour))
+
+
+
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*

data/Gemfile

@@ -5,4 +5,4 @@ gemspec
 
 gem "bump", "~> 0.10.0"
 
-gem "github_changelog_generator", "~> 1.16"
+gem "github_changelog_generator", "~> 1.16"

data/README.md

@@ -22,8 +22,6 @@ And then execute:
     # Then select your service manager
     install_plugin Capistrano::Sidekiq::Systemd
     # or
-    install_plugin Capistrano::Sidekiq::Upstart  # tests needed
-    # or
     install_plugin Capistrano::Sidekiq::Monit  # tests needed
 ```
 
@@ -67,13 +65,6 @@ Configurable options - Please ensure you check your version's branch for the ava
 ```
 See `capistrano/sidekiq/helpers.rb` for other undocumented configuration settings.
 
-## Known issues with Capistrano 3
-
-There is a known bug that prevents sidekiq from starting when pty is true on Capistrano 3.
-```ruby
-set :pty,  false
-```
-
 ## Bundler
 
 If you'd like to prepend `bundle exec` to your sidekiq and sidekiqctl calls, modify the SSHKit command maps

data/Rakefile

@@ -5,5 +5,5 @@ GitHubChangelogGenerator::RakeTask.new :changelog do |config|
   config.user = 'seuros'
   config.project = 'capistrano-sidekiq'
   config.issues = false
-  config.future_release = '2.2.0'
+  config.future_release = '2.3.0'
 end

data/lib/capistrano/sidekiq/helpers.rb

@@ -1,22 +1,18 @@
+# frozen_string_literal: true
+
 module Capistrano
   module Sidekiq::Helpers
 
     def sidekiq_require
-      if fetch(:sidekiq_require)
-        "--require #{fetch(:sidekiq_require)}"
-      end
+      "--require #{fetch(:sidekiq_require)}" if fetch(:sidekiq_require)
     end
 
     def sidekiq_config
-      if fetch(:sidekiq_config)
-        "--config #{fetch(:sidekiq_config)}"
-      end
+      "--config #{fetch(:sidekiq_config)}" if fetch(:sidekiq_config)
     end
 
     def sidekiq_concurrency
-      if fetch(:sidekiq_concurrency)
-        "--concurrency #{fetch(:sidekiq_concurrency)}"
-      end
+      "--concurrency #{fetch(:sidekiq_concurrency)}" if fetch(:sidekiq_concurrency)
     end
 
     def sidekiq_queues
@@ -29,14 +25,12 @@ module Capistrano
       fetch(:sidekiq_log)
     end
 
-    def switch_user(role)
+    def switch_user(role, &block)
       su_user = sidekiq_user(role)
       if su_user == role.user
         yield
       else
-        as su_user do
-          yield
-        end
+        as su_user, &block
       end
     end
 
@@ -55,6 +49,5 @@ module Capistrano
     def expanded_bundle_path
       backend.capture(:echo, SSHKit.config.command_map[:bundle]).strip
     end
-
   end
 end

data/lib/capistrano/sidekiq/monit.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Capistrano
   class Sidekiq::Monit < Capistrano::Plugin
     include Sidekiq::Helpers
@@ -13,7 +15,7 @@ module Capistrano
     end
 
     def define_tasks
-      eval_rakefile File.expand_path('../../tasks/monit.rake', __FILE__)
+      eval_rakefile File.expand_path('../tasks/monit.rake', __dir__)
     end
   end
 end

data/lib/capistrano/sidekiq/systemd.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module Capistrano
   class Sidekiq::Systemd < Capistrano::Plugin
     include Sidekiq::Helpers
 
     def set_defaults
-      set_if_empty :sidekiq_service_unit_name, 'sidekiq' # This will change in version 3.0.0 to {application}-sidekiq
+      set_if_empty :sidekiq_service_unit_name, 'sidekiq' # This will change in version 3.0.0 to {application}_sidekiq_{stage}
       set_if_empty :sidekiq_service_unit_user, :user # :system
       set_if_empty :sidekiq_enable_lingering, true
       set_if_empty :sidekiq_lingering_user, nil
@@ -11,7 +13,7 @@ module Capistrano
     end
 
     def define_tasks
-      eval_rakefile File.expand_path('../../tasks/systemd.rake', __FILE__)
+      eval_rakefile File.expand_path('../tasks/systemd.rake', __dir__)
     end
   end
 end

data/lib/capistrano/sidekiq/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Capistrano
-  SidekiqVERSION = '2.2.0'
+  SidekiqVERSION = '2.3.0'
 end

data/lib/capistrano/sidekiq.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require 'capistrano/bundler'
-require "capistrano/plugin"
+require 'capistrano/plugin'
 
 module Capistrano
   class Sidekiq < Capistrano::Plugin
     def define_tasks
-      eval_rakefile File.expand_path('../tasks/sidekiq.rake', __FILE__)
+      eval_rakefile File.expand_path('tasks/sidekiq.rake', __dir__)
     end
 
     def set_defaults
@@ -21,11 +23,9 @@ module Capistrano
       # Bundler integration
       append :bundle_bins, 'sidekiq', 'sidekiqctl'
     end
-
   end
 end
 
 require_relative 'sidekiq/helpers'
 require_relative 'sidekiq/systemd'
-require_relative 'sidekiq/upstart'
 require_relative 'sidekiq/monit'

data/lib/capistrano/tasks/systemd.rake

@@ -146,18 +146,25 @@ namespace :sidekiq do
   def create_systemd_template
     ctemplate = compiled_template
     systemd_path = fetch(:service_unit_path, fetch_systemd_unit_path)
-    systemd_file_name = File.join(systemd_path, sidekiq_service_file_name)
-
     backend.execute :mkdir, '-p', systemd_path if fetch(:sidekiq_service_unit_user) == :user
 
-    temp_file_name = File.join('/tmp', sidekiq_service_file_name)
-    backend.upload!(StringIO.new(ctemplate), temp_file_name)
-    if fetch(:sidekiq_service_unit_user) == :system
-      backend.execute :sudo, :mv, temp_file_name, systemd_file_name
-      backend.execute :sudo, :systemctl, 'daemon-reload'
+    if sidekiq_processes > 1
+      range = 1..sidekiq_processes
     else
-      backend.execute :mv, temp_file_name, systemd_file_name
-      backend.execute :systemctl, '--user', 'daemon-reload'
+      range = 0..0
+    end
+    range.each do |index|
+      temp_file_name = File.join('/tmp', sidekiq_service_file_name(index))
+      systemd_file_name = File.join(systemd_path, sidekiq_service_file_name(index))
+      backend.upload!(StringIO.new(ctemplate), temp_file_name)
+
+      if fetch(:sidekiq_service_unit_user) == :system
+        backend.execute :sudo, :mv, temp_file_name, systemd_file_name
+        backend.execute :sudo, :systemctl, 'daemon-reload'
+      else
+        backend.execute :mv, temp_file_name, systemd_file_name
+        backend.execute :systemctl, '--user', 'daemon-reload'
+      end
     end
   end
 
@@ -200,8 +207,7 @@ namespace :sidekiq do
       else
         [:systemctl, '--user']
       end
-
-    if process
+    if process && sidekiq_processes > 1
       execute_array.push(
         *args, sidekiq_service_unit_name(process: process)
         ).flatten
@@ -255,15 +261,14 @@ namespace :sidekiq do
     end.join(' ')
   end
 
-  def sidekiq_service_file_name
-    "#{fetch(:sidekiq_service_unit_name)}.service"
+  def sidekiq_service_file_name(index = nil)
+    return "#{fetch(:sidekiq_service_unit_name)}.service" if index.to_i.zero?
+    "#{fetch(:sidekiq_service_unit_name)}@#{index}.service"
   end
 
   def sidekiq_service_unit_name(process: nil)
-    if process
+    if process && sidekiq_processes > 1
       "#{fetch(:sidekiq_service_unit_name)}@#{process}"
-    elsif sidekiq_processes > 1
-      "#{fetch(:sidekiq_service_unit_name)}@{1..#{sidekiq_processes}}"
     else
       fetch(:sidekiq_service_unit_name)
     end
@@ -272,9 +277,7 @@ namespace :sidekiq do
   # process = 1 | sidekiq_systemd_1.yaml
   # process = nil | sidekiq_systemd_%i.yaml
   def sidekiq_systemd_config_name(process = nil)
-    file_name = 'sidekiq_systemd_'
-    file_name << (process&.to_s || '%i')
-    "#{file_name}.yaml"
+   "sidekiq_systemd_#{(process&.to_s || '%i')}.yaml"
   end
 
   def config_per_process?

data/lib/generators/capistrano/sidekiq/monit/templates/sidekiq_monit.conf.erb

@@ -1,6 +1,8 @@
-# Monit configuration for Sidekiq :  <%= fetch(:application) %>
-  check process <%= sidekiq_service_name %>
-  matching 'sidekiq .* <%= fetch(:full_app_name) %>'
-  start program = "/bin/su - <%= sidekiq_user(role) %> -c 'cd <%= current_path %> && <%= SSHKit.config.command_map[:bundle] %> exec sidekiq -e <%= fetch(:sidekiq_env) %> <%= sidekiq_config %> <%= sidekiq_concurrency %> <%= sidekiq_require %> <%= sidekiq_queues %> <%= sidekiq_logfile ? ">> #{sidekiq_logfile} 2>&1" : nil %> &'" with timeout 30 seconds
-  stop program = "/bin/su - <%= sidekiq_user(role) %> -c 'ps -ax | grep "<%= "sidekiq .* #{fetch(:full_app_name)}" %>" | grep -v grep | awk "{print \$1}" | xargs --no-run-if-empty kill'" with timeout <%= fetch(:sidekiq_timeout).to_i + 10  %> seconds
+# Monit configuration for Sidekiq
+# Service name: <%= sidekiq_service_name %>
+#
+check process <%= sidekiq_service_name %>
+  matching 'sidekiq .* <%= fetch(:application) %>'
+  start program = "/bin/su - <%= sidekiq_user(role) %> -c 'cd <%= current_path %> && <%= SSHKit.config.command_map[:bundle] %> exec sidekiq -e <%= fetch(:sidekiq_env) %> <%= sidekiq_config %> <%= sidekiq_concurrency %> <%= sidekiq_require %> <%= sidekiq_queues %> <%= sidekiq_logfile ? ">> #{sidekiq_logfile} 2>&1" : nil %> &'" with timeout <%= fetch(:sidekiq_timeout).to_i + 10 %> seconds
+  stop program = "/bin/su - <%= sidekiq_user(role) %> -c 'ps ax | grep "<%= "sidekiq .* #{fetch(:application)}" %>" | grep -v grep | awk "{print \$1}" | xargs --no-run-if-empty kill'" with timeout <%= fetch(:sidekiq_timeout).to_i + 10  %> seconds
   group <%= fetch(:sidekiq_monit_group) || fetch(:application) %>-sidekiq

data/lib/generators/capistrano/sidekiq/systemd/templates/sidekiq.service.capistrano.erb

@@ -5,13 +5,13 @@
 # Customize this file based on your bundler location, app directory, etc.
 # Customize and copy this into /usr/lib/systemd/system (CentOS) or /lib/systemd/system (Ubuntu).
 # Then run:
-#   - systemctl enable sidekiq
-#   - systemctl {start,stop,restart} sidekiq
+#   - systemctl enable <%= sidekiq_service_unit_name %>
+#   - systemctl {start,stop,restart} <%= sidekiq_service_unit_name %>
 #
 # This file corresponds to a single Sidekiq process.  Add multiple copies
 # to run multiple processes (sidekiq-1, sidekiq-2, etc).
 #
-# Use `journalctl -u sidekiq -rn 100` to view the last 100 lines of log output.
+# Use `journalctl -u <%= sidekiq_service_unit_name %> -rn 100` to view the last 100 lines of log output.
 #
 [Unit]
 Description=sidekiq for <%= "#{fetch(:application)} (#{fetch(:stage)})" %>
@@ -44,8 +44,7 @@ WatchdogSec=10
 WorkingDirectory=<%= File.join(fetch(:deploy_to), 'current') %>
 ExecStart=<%= expanded_bundle_path %> exec sidekiq -e <%= fetch(:sidekiq_env) %> <%= sidekiq_config %> <%= sidekiq_concurrency %> <%= sidekiq_queues %>
 
-# Use `systemctl kill -s TSTP sidekiq` to quiet the Sidekiq process
-
+# Use `systemctl kill -s TSTP <%= sidekiq_service_unit_name %>` to quiet the Sidekiq process
 <%="User=#{sidekiq_user}" if sidekiq_user %>
 UMask=0002
 
@@ -63,8 +62,7 @@ Restart=on-failure
 <%="StandardOutput=append:#{fetch(:sidekiq_log)}" if fetch(:sidekiq_log) %>
 <%="StandardError=append:#{fetch(:sidekiq_error_log)}" if fetch(:sidekiq_error_log) %>
 
-# This will default to "bundler" if we don't specify it
-SyslogIdentifier=sidekiq
+SyslogIdentifier=<%= sidekiq_service_unit_name %>
 
 [Install]
 WantedBy=default.target

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-sidekiq
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Abdelkader Boudih
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-16 00:00:00.000000000 Z
+date: 2022-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -62,7 +62,6 @@ files:
 - ".gitignore"
 - ".tool-versions"
 - CHANGELOG.md
-- CONTRIBUTORS.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -73,17 +72,13 @@ files:
 - lib/capistrano/sidekiq/helpers.rb
 - lib/capistrano/sidekiq/monit.rb
 - lib/capistrano/sidekiq/systemd.rb
-- lib/capistrano/sidekiq/upstart.rb
 - lib/capistrano/sidekiq/version.rb
 - lib/capistrano/tasks/monit.rake
 - lib/capistrano/tasks/sidekiq.rake
 - lib/capistrano/tasks/systemd.rake
-- lib/capistrano/tasks/upstart.rake
 - lib/generators/capistrano/sidekiq/monit/template_generator.rb
 - lib/generators/capistrano/sidekiq/monit/templates/sidekiq_monit.conf.erb
 - lib/generators/capistrano/sidekiq/systemd/templates/sidekiq.service.capistrano.erb
-- lib/generators/capistrano/sidekiq/upstart/templates/sidekiq.conf.erb
-- lib/generators/capistrano/sidekiq/upstart/templates/workers.conf.erb
 homepage: https://github.com/seuros/capistrano-sidekiq
 licenses:
 - LGPL-3.0

data/CONTRIBUTORS.md

@@ -1,11 +0,0 @@
-## Contributors
-
-- [Jérémy Lecour] (https://github.com/jlecour)
-- [Fabien Penso] (https://github.com/penso)
-- [Alex Dunae] (https://github.com/alexdunae)
-- [andreygerasimchuk] (https://github.com/andreygerasimchuk)
-- [Saicheg] (https://github.com/Saicheg)
-- [Alex Yakubenko] (https://github.com/alexyakubenko)
-- [Robert Strobl] (https://github.com/rstrobl)
-- [Eurico Doirado] (https://github.com/okoriko)
-- [Huang Bin](https://github.com/hbin)

data/lib/capistrano/sidekiq/upstart.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module Capistrano
-  class Sidekiq::Upstart < Capistrano::Plugin
-    include Sidekiq::Helpers
-
-    def set_defaults
-      set_if_empty :sidekiq_service_unit_name, 'sidekiq' # This will change in version 3.0.0 to {application}-sidekiq
-    end
-
-    def define_tasks
-      eval_rakefile File.expand_path('../tasks/upstart.rake', __dir__)
-    end
-  end
-end

data/lib/capistrano/tasks/upstart.rake

@@ -1,104 +0,0 @@
-# frozen_string_literal: true
-
-git_plugin = self
-
-SUPPRESS_FAILURE = %w[|| echo NO_RUNNING_INSTANCE].freeze
-
-namespace :sidekiq do
-  desc 'Quiet sidekiq (stop fetching new tasks from Redis)'
-  task :quiet do
-    on roles fetch(:sidekiq_roles) do |role|
-      git_plugin.switch_user(role) do
-        sudo :service, fetch(:sidekiq_service_unit_name), :reload, *SUPPRESS_FAILURE
-      end
-    end
-  end
-
-  desc 'Stop sidekiq (graceful shutdown within timeout, put unfinished tasks back to Redis)'
-  task :stop do
-    on roles fetch(:sidekiq_roles) do |role|
-      git_plugin.switch_user(role) do
-        sudo :service, fetch(:sidekiq_service_unit_name), :stop, *SUPPRESS_FAILURE
-      end
-    end
-  end
-
-  desc 'Start sidekiq'
-  task :start do
-    on roles fetch(:sidekiq_roles) do |role|
-      git_plugin.switch_user(role) do
-        sudo :service, fetch(:sidekiq_service_unit_name), :start
-      end
-    end
-  end
-
-  desc 'Install upstart sidekiq service'
-  task :install do
-    on roles fetch(:sidekiq_roles) do |role|
-      git_plugin.switch_user(role) do
-        git_plugin.create_upstart_template
-      end
-    end
-  end
-
-  desc 'UnInstall upstart sidekiq service'
-  task :uninstall do
-    on roles fetch(:sidekiq_roles) do |role|
-      git_plugin.switch_user(role) do
-        execute :rm, '-f',
-                File.join(fetch(:service_unit_path, fetch_upstart_unit_path), fetch(:sidekiq_service_unit_name))
-      end
-    end
-  end
-
-  desc 'Generate service_locally'
-  task :generate_service_locally do
-    run_locally do
-      File.write('sidekiq.conf', git_plugin.compiled_template)
-    end
-  end
-
-  def fetch_upstart_unit_path
-    if fetch(:sidekiq_service_unit_user) == :system
-      # if the path is not standard `set :service_unit_path`
-      '/etc/init'
-    else
-      home_dir = backend.capture :pwd
-      File.join(home_dir, '.config', 'upstart')
-    end
-  end
-
-  def compiled_template
-    search_paths = [
-      File.expand_path(
-        File.join(*%w[.. .. .. generators capistrano sidekiq upstart templates sidekiq.conf.erb]),
-        __FILE__
-      )
-    ]
-    template_path = search_paths.detect { |path| File.file?(path) }
-    template = File.read(template_path)
-    ERB.new(template).result(binding)
-  end
-
-  def create_upstart_template
-    ctemplate = compiled_template
-    upstart_path = fetch(:service_unit_path, fetch_upstart_unit_path)
-
-    backend.execute :mkdir, '-p', upstart_path if fetch(:sidekiq_service_unit_user) != :system
-    conf_filename = "#{fetch :sidekiq_service_unit_name}.conf"
-    backend.upload!(
-      StringIO.new(ctemplate),
-      "/tmp/#{conf_filename}"
-    )
-    backend.execute :sudo, :mv, "/tmp/#{conf_filename}", "#{upstart_path}/#{conf_filename}"
-    if fetch(:sidekiq_service_unit_user) == :system
-      backend.execute :sudo, :initctl, 'reload-configuration'
-    else
-      # backend.execute :sudo, :initctl,  'reload-configuration' #TODO
-    end
-  end
-
-  def num_workers
-    fetch(:sidekiq_upstart_num_workers, nil)
-  end
-end

data/lib/generators/capistrano/sidekiq/upstart/templates/sidekiq.conf.erb

@@ -1,78 +0,0 @@
-# /etc/init/sidekiq.conf - Sidekiq config | https://github.com/mperham/sidekiq/blob/master/examples/upstart/sidekiq.conf
-
-# This example config should work with Ubuntu 12.04+.  It
-# allows you to manage multiple Sidekiq instances with
-# Upstart, Ubuntu's native service management tool.
-#
-# See workers.conf for how to manage all Sidekiq instances at once.
-#
-# Save this config as /etc/init/sidekiq.conf then manage sidekiq with:
-#   sudo start <%= fetch(:sidekiq_service_unit_name) %> index=0
-#   sudo stop <%= fetch(:sidekiq_service_unit_name) %> index=0
-#   sudo status <%= fetch(:sidekiq_service_unit_name) %> index=0
-#
-# Hack Upstart's reload command to 'quiet' Sidekiq:
-#
-#   sudo reload <%= fetch(:sidekiq_service_unit_name) %> index=0
-#
-# or use the service command:
-#   sudo service <%= fetch(:sidekiq_service_unit_name) %> {start,stop,restart,status}
-#
-
-description "Sidekiq for <%= "#{fetch(:application)} (#{fetch(:stage)})" %>"
-
-# This script is not meant to start on bootup, workers.conf
-# will start all sidekiq instances explicitly when it starts.
-#start on runlevel [2345]
-#stop on runlevel [06]
-<% if sidekiq_user %>
-
-# change to match your deployment user
-setuid <%= sidekiq_user %>
-setgid <%= sidekiq_user %>
-env HOME=/home/<%= sidekiq_user %>
-<% end %>
-
-# Greatly reduce Ruby memory fragmentation and heap usage
-# https://www.mikeperham.com/2018/04/25/taming-rails-memory-bloat/
-env MALLOC_ARENA_MAX=2
-
-respawn
-respawn limit 3 30
-
-# TERM is used when stopping sidekiq. Without declaring these as
-# normal exit codes, it just respawns.
-normal exit 0 TERM
-
-# Older versions of Upstart might not support the reload command and need
-# this commented out.
-reload signal TSTP
-
-# Upstart waits 5 seconds by default to kill a process. Increase timeout to
-# give sidekiq process enough time to exit.
-kill timeout 30
-<% if num_workers %>
-
-instance $index
-<% end %>
-script
-# this script runs in /bin/sh by default
-# respawn as bash so we can source in rbenv
-exec /bin/bash <<'EOT'
-  # Pick your poison :) Or none if you're using a system wide installed Ruby.
-  # rbenv
-  # source /home/apps/.bash_profile
-  # OR
-  # source /home/apps/.profile
-  # OR system:
-  # source /etc/profile.d/rbenv.sh
-  #
-  # rvm
-  # source /home/apps/.rvm/scripts/rvm
-
-  # Logs out to /var/log/upstart/<%= fetch(:sidekiq_service_unit_name) %>.log by default
-
-  cd <%= File.join(fetch(:deploy_to), 'current') %>
-  exec <%= SSHKit.config.command_map[:bundle] %> exec sidekiq -e <%= fetch(:sidekiq_env) %> <%= sidekiq_config %> <%= sidekiq_concurrency %> <%= sidekiq_queues %>
-EOT
-end script

data/lib/generators/capistrano/sidekiq/upstart/templates/workers.conf.erb

@@ -1,37 +0,0 @@
-# /etc/init/workers.conf - manage a set of Sidekiqs | https://github.com/mperham/sidekiq/blob/master/examples/upstart/workers.conf
-
-# This example config should work with Ubuntu 14.10 and below  It
-# allows you to manage multiple Sidekiq instances with
-# Upstart, Ubuntu's native service management tool.
-#
-# See sidekiq.conf for how to manage a single Sidekiq instance.
-#
-# Use "stop workers" to stop all Sidekiq instances.
-# Use "start workers" to start all instances.
-# Use "restart workers" to restart all instances.
-# Crazy, right?
-#
-
-description "manages the set of sidekiq processes"
-
-# This starts upon bootup and stops on shutdown
-start on runlevel [2345]
-stop on runlevel [06]
-
-# Set this to the number of Sidekiq processes you want
-# to run on this machine
-env NUM_WORKERS=2
-
-pre-start script
-  for i in `seq 1 ${NUM_WORKERS}`
-  do
-    start sidekiq index=$i
-  done
-end script
-
-post-stop script
-  for i in `seq 1 ${NUM_WORKERS}`
-  do
-    stop sidekiq index=$i
-  done
-end script