capistrano-sidekiq 2.0.0.beta2 → 2.0.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91c3f4102ef3615f03a48a556d88c44ab661d261b9a3de0c1ac64c8bfcbe8b8e
-  data.tar.gz: cad9284e68f38ef297e68e243ae3c986d1952e09113ecbd859336447a878ac6b
+  metadata.gz: 01e37e98d391172380ba15ee0c478e8669ad869cf4be1b83a8c61e2ef4ba9dfb
+  data.tar.gz: 418a99c90061cababdd5f0e3907b967f44fda2a7c25460f749f7738e12e072df
 SHA512:
-  metadata.gz: ce5c062014f43fbc0412fb1fdbb2624f3c4782bc63bb81b016c653cea4ad35bcbc7b6a9c62cc7e8d05b79a41c4eb77b3cbd9a49f6d68ea7748ebc60152587952
-  data.tar.gz: 6060d3d29376741acb8ceef5371fedaa6cf9473a05fd66f84fb348eca61ce5154f39ab402de3f4a44aefd6d3c220022382414541d98c050706039b9f3e24cf89
+  metadata.gz: 184f40bb8a1d41fd346cd32c5f55dff603888b462aa38a68b39faac4ce25836232109ca92e4bb9ba458ca4915cbf9c06a6228dabd5eb1a6b464dc389bebd9eaa
+  data.tar.gz: b616d1322ca5d835e808265d3303852428da7d152be27d6472954a02d3a894536c45c29f6c086e2e8cb2b32f0276cb342294766d7f9e99c4e62864344a597793

data/README.md

@@ -37,6 +37,12 @@ Configurable options, shown here with defaults:
 :sidekiq_env => fetch(:rack_env, fetch(:rails_env, fetch(:stage)))
 :sidekiq_log => File.join(shared_path, 'log', 'sidekiq.log')
 
+# sidekiq systemd options
+:sidekiq_service_unit_name => 'sidekiq'
+:sidekiq_service_unit_user => :user # :system
+:sidekiq_enable_lingering => true
+:sidekiq_lingering_user => nil
+
 # sidekiq monit
 :sidekiq_monit_templates_path => 'config/deploy/templates'
 :sidekiq_monit_conf_dir => '/etc/monit/conf.d'

data/lib/capistrano/sidekiq.rb

@@ -13,6 +13,7 @@ module Capistrano
       set_if_empty :sidekiq_env, -> { fetch(:rack_env, fetch(:rails_env, fetch(:rake_env, fetch(:stage)))) }
       set_if_empty :sidekiq_roles, fetch(:sidekiq_role, :app)
       set_if_empty :sidekiq_log, -> { File.join(shared_path, 'log', 'sidekiq.log') }
+      set_if_empty :sidekiq_error_log, -> { File.join(shared_path, 'log', 'sidekiq.error.log') }
       # Rbenv, Chruby, and RVM integration
       append :rbenv_map_bins, 'sidekiq', 'sidekiqctl'
       append :rvm_map_bins, 'sidekiq', 'sidekiqctl'

data/lib/capistrano/sidekiq/systemd.rb

@@ -3,6 +3,8 @@ module Capistrano
     def set_defaults
       set_if_empty :sidekiq_service_unit_name, 'sidekiq'
       set_if_empty :sidekiq_service_unit_user, :user # :system
+      set_if_empty :sidekiq_enable_lingering, true
+      set_if_empty :sidekiq_lingering_user, nil
     end
 
     def define_tasks

data/lib/capistrano/sidekiq/version.rb

@@ -1,3 +1,3 @@
 module Capistrano
-  SidekiqVERSION = '2.0.0.beta2'
+  SidekiqVERSION = '2.0.0.beta3'
 end

data/lib/capistrano/tasks/systemd.rake

@@ -49,6 +49,7 @@ namespace :sidekiq do
           execute :sudo, :systemctl, "enable", fetch(:sidekiq_service_unit_name)
         else
           execute :systemctl, "--user", "enable", fetch(:sidekiq_service_unit_name)
+          execute :loginctl, "enable-linger", fetch(:sidekiq_lingering_user) if fetch(:sidekiq_enable_lingering)
         end
       end
     end

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

@@ -5,9 +5,11 @@ After=syslog.target network.target
 [Service]
 Type=simple
 WorkingDirectory=<%= File.join(fetch(:deploy_to), 'current') %>
-ExecStart=<%= SSHKit.config.command_map[:bundler] %> exec sidekiq -e <%= fetch(:sidekiq_env) %> -l <%= fetch(:sidekiq_log) %>
+ExecStart=<%= SSHKit.config.command_map[:bundler] %> exec sidekiq -e <%= fetch(:sidekiq_env) %>
 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}" if sidekiq_user %>
 <%="EnvironmentFile=#{fetch(:sidekiq_service_unit_env_file)}" if fetch(:sidekiq_service_unit_env_file) %>
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-sidekiq
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta2
+  version: 2.0.0.beta3
 platform: ruby
 authors:
 - Abdelkader Boudih
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-25 00:00:00.000000000 Z
+date: 2020-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano