capistrano-sidekiq-systemd 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf9409c23a84e7e446cff8abd4b7f30188cb9fa6d6f2443815ae97200bbb3967
-  data.tar.gz: d88865d20c429021fd362137c74bb9f6a28939ba1746f917970776aeb6dcd13b
+  metadata.gz: ecdeef1273903466bfbf2b1c8adaf58c9185f4f120c9da54ce7bd5759c5e9c6f
+  data.tar.gz: 7f87a9b25213435c5e4fc12ebe94a7cd6d28cb08a858072dd3cd9ccc631e089f
 SHA512:
-  metadata.gz: e831e9e88f1e165b52156f084f8e986adf4c3ab394526befb10af9fcbe6d95adc9b2cb6a69dc2a9b301c107ca65daa89837a1099a2180b929125542b499b4185
-  data.tar.gz: 74b8ca37c76cf6a93098fb112958f92ed2a69dcd2af48c0e66180df8ea27b697e068da06a7c42294c26058be6ebaf6afbba32b1a0ee3f9ad12a689f5ffde2038
+  metadata.gz: 5d05a25aebe6bd814a0f1087e458b53ec89c2acdc864a7e31351c2ff9ec097f4663c847be0f0ec5b00b7690218f09c5c21fd03204dc2bb391056a14f3ca7d59e
+  data.tar.gz: 77a2ca2fd421f5c918f4f6d43347ca42fc4348efbcc8d5e18caedbdff4edcac375ef92c67b76bb03ce8d564ae3adbf82264461f640afade90d656c558693003d

data/.gitignore

@@ -9,3 +9,5 @@
 
 # rspec failure tracking
 .rspec_status
+
+/*.gem

data/README.md

@@ -36,6 +36,7 @@ set :sidekiq_options_per_process, nil
 set :sidekiq_user, nil
 set :sidekiq_max_mem, nil
 set :service_unit_name, "sidekiq-#{fetch(:stage)}.service"
+set :sidekiq_service_unit_user => :user # :system
 # Rbenv, Chruby, and RVM integration
 set :rbenv_map_bins, fetch(:rbenv_map_bins).to_a.concat(%w[sidekiq])
 set :rvm_map_bins, fetch(:rvm_map_bins).to_a.concat(%w[sidekiq])

data/lib/capistrano/sidekiq/systemd/version.rb

@@ -1,7 +1,7 @@
 module Capistrano
   module Sidekiq
     module Systemd
-      VERSION = "0.1.0"
+      VERSION = "0.2.0"
     end
   end
 end

data/lib/capistrano/sidekiq/tasks/systemd.rake

@@ -7,6 +7,9 @@ namespace :load do
     set :sidekiq_user, nil
     set :sidekiq_max_mem, nil
     set :service_unit_name, "sidekiq-#{fetch(:stage)}.service"
+    set :sidekiq_service_unit_user, :user
+    set :sidekiq_log, nil
+    set :sidekiq_error_log, nil
     # Rbenv, Chruby, and RVM integration
     set :rbenv_map_bins, fetch(:rbenv_map_bins).to_a.concat(%w[sidekiq])
     set :rvm_map_bins, fetch(:rvm_map_bins).to_a.concat(%w[sidekiq])
@@ -42,7 +45,7 @@ namespace :sidekiq do
     on roles fetch(:sidekiq_roles) do |role|
       switch_user(role) do
         sidekiq_options_per_process.each_index do |index|
-          execute :systemctl, "--user", "reload", service_unit_name(index), raise_on_non_zero_exit: false
+          systemctl(command: 'reload', service_unit_name: service_unit_name(index), raise_on_non_zero_exit: false)
         end
       end
     end
@@ -53,7 +56,7 @@ namespace :sidekiq do
     on roles fetch(:sidekiq_roles) do |role|
       switch_user(role) do
         sidekiq_options_per_process.each_index do |index|
-          execute :systemctl, "--user", "stop", service_unit_name(index)
+          systemctl(command: 'stop', service_unit_name: service_unit_name(index))
         end
       end
     end
@@ -64,7 +67,7 @@ namespace :sidekiq do
     on roles fetch(:sidekiq_roles) do |role|
       switch_user(role) do
         sidekiq_options_per_process.each_index do |index|
-          execute :systemctl, "--user", "start", service_unit_name(index)
+          systemctl(command: 'start', service_unit_name: service_unit_name(index))
         end
       end
     end
@@ -82,7 +85,7 @@ namespace :sidekiq do
       switch_user(role) do
         create_systemd_template(role)
         sidekiq_options_per_process.each_index do |index|
-          execute :systemctl, "--user", "enable", service_unit_name(index)
+          systemctl(command: 'enable', service_unit_name: service_unit_name(index))
         end
       end
     end
@@ -93,8 +96,8 @@ namespace :sidekiq do
     on roles fetch(:sidekiq_roles) do |role|
       switch_user(role) do
         sidekiq_options_per_process.each_index do |index|
-          execute :systemctl, "--user", "disable", service_unit_name(index)
-          execute :rm, File.join(fetch(:service_unit_path, File.join(capture(:pwd), ".config", "systemd", "user")),service_unit_name(index))
+          systemctl(command: 'disable', service_unit_name: service_unit_name(index))
+          execute :rm, File.join(fetch(:service_unit_path, fetch_systemd_unit_path(capture(:pwd))), service_unit_name(index))
         end
       end
     end
@@ -103,13 +106,17 @@ namespace :sidekiq do
   def create_systemd_template(role)
     template = File.read(File.expand_path('../../../../generators/capistrano/sidekiq/systemd/templates/sidekiq.service.capistrano.erb', __FILE__))
     home_dir = capture :pwd
-    systemd_path = fetch(:service_unit_path, File.join(home_dir, ".config", "systemd", "user"))
+    systemd_path = fetch(:service_unit_path, fetch_systemd_unit_path(home_dir))
     sidekiq_cmd = SSHKit.config.command_map[:sidekiq].gsub('~', home_dir)
-    execute :mkdir, "-p", systemd_path
+    if fetch(:sidekiq_service_unit_user) == :user
+      execute :mkdir, "-p", systemd_path
+    end
     sidekiq_options_per_process.each_index do |index|
-      upload!(StringIO.new(ERB.new(template).result(binding)), "#{systemd_path}/#{service_unit_name(index)}")
+      upload_template(data: StringIO.new(ERB.new(template).result(binding)),
+        systemd_path: systemd_path, service_unit_name: service_unit_name(index)
+      )
     end
-    execute :systemctl, "--user", "daemon-reload"
+    systemctl(command: 'daemon-reload')
   end
 
   def process_options(index = 0)
@@ -183,6 +190,33 @@ namespace :sidekiq do
     end
   end
 
+  def systemctl(command:, service_unit_name: nil, raise_on_non_zero_exit: true)
+    if fetch(:sidekiq_service_unit_user) == :user
+      execute :systemctl, "--user", command, service_unit_name, raise_on_non_zero_exit: raise_on_non_zero_exit
+    elsif fetch(:sidekiq_service_unit_user) == :system
+      execute :sudo, :systemctl, command, service_unit_name, raise_on_non_zero_exit: raise_on_non_zero_exit
+    end
+  end
+
+  def fetch_systemd_unit_path(home_dir)
+    if fetch(:sidekiq_service_unit_user) == :user
+      File.join(home_dir, ".config", "systemd", "user")
+    elsif fetch(:sidekiq_service_unit_user) == :system
+      File.join("/", "etc", "systemd", "system")
+    end
+  end
+
+  def upload_template(data:, systemd_path:, service_unit_name:)
+    temp_file_path = File.join('/', 'tmp', "#{service_unit_name}")
+    upload!(data, temp_file_path)
+    if fetch(:sidekiq_service_unit_user) == :system
+      execute :sudo, :mv, temp_file_path, File.join(systemd_path, service_unit_name)
+    else
+      execute :mv, temp_file_path, File.join(systemd_path, service_unit_name)
+    end
+    systemctl(command: 'daemon-reload')
+  end
+
   def multiple_processes?
     fetch(:sidekiq_options_per_process) && fetch(:sidekiq_options_per_process).size > 1
   end

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

@@ -9,6 +9,9 @@ WorkingDirectory=<%= fetch(:deploy_to) %>/current
 ExecStart=<%= sidekiq_cmd %> <%= process_options(index) %>
 ExecReload=/bin/kill -TSTP $MAINPID
 ExecStop=/bin/kill -TERM $MAINPID
+<%="StandardOutput=append:#{fetch(:sidekiq_log)}" if fetch(:sidekiq_log) %>
+<%="StandardError=append:#{fetch(:sidekiq_error_log)}" if fetch(:sidekiq_error_log) %>
+<%="User=#{sidekiq_user(role)}" if sidekiq_user(role) %>
 <%= "MemoryAccounting=#{ !!max_mem(index) }" if max_mem(index) %>
 <%= "MemoryLimit=#{ max_mem(index) }"  if max_mem(index) %>
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-sidekiq-systemd
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - spilin
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-03-04 00:00:00.000000000 Z
+date: 2021-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -57,7 +57,7 @@ metadata:
   homepage_uri: https://github.com/spilin/capistrano-sidekiq-systemd
   source_code_uri: https://github.com/spilin/capistrano-sidekiq-systemd
   changelog_uri: https://github.com/spilin/capistrano-sidekiq-systemd/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -72,8 +72,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Capistrano sidekiq systemd support
 test_files: []