capistrano-sidekiq 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: de33c4866848767330e460a97d79f5f1d893a097
-  data.tar.gz: 66c5d04a7c20407109c58d94f9ec753aae609f2a
+SHA256:
+  metadata.gz: 2eadf4da0195248e5ce25a260423b32f4f71e7f54b6c0d396b7f5e1c40604aa3
+  data.tar.gz: e682b32cc48da4c50aebfaed702c7dd98a27b04f23747da96289807a32fa105a
 SHA512:
-  metadata.gz: b6e2fb6a18bdeefcc701b4117f98a526f8b2480e2aa9c06aa2aa9fc8dcf593a427724a2daefe65e2eb880c2d6e15b321f9bc05cd7de5bdbda406274959499ba4
-  data.tar.gz: 8e03edcb511a08082e157e07622ecbb49068d205a8715b6debb019df8f757bf8ea771fc511cf239daab109a40028888bda2d09cf08eb64d90d73494edaa4977a
+  metadata.gz: a2016c2552e53d2eb04e8615b094b7d52b868907db40e196b0b5fa2b13de0121b81f9921e7947d9758fd68a12377a8355de5da4556629e5d4d8b9aa3a3ff3cfd
+  data.tar.gz: eeccd0a9dea2b6a81ed1de9e4a72cf909b1a12e67f9aa06043f0c57e7f13fef8b536b41442eb190a35048a211ed8e8e53162307c5cef2ead88ab84f85f04c5fa

data/.gitignore

@@ -16,3 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 .idea
+*.iml

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.0.3
+- Add upstart support
+- Fix monit service name
+
 ## 1.0.2
 - Fix deployment flow hooks
 

data/README.md

@@ -1,5 +1,4 @@
 [![Gem Version](https://badge.fury.io/rb/capistrano-sidekiq.svg)](http://badge.fury.io/rb/capistrano-sidekiq)
-[![Dependency Status](https://gemnasium.com/seuros/capistrano-sidekiq.svg)](https://gemnasium.com/seuros/capistrano-sidekiq)
 
 # Capistrano::Sidekiq
 
@@ -85,6 +84,7 @@ This example should boot the first process with the queue `high` and the second
 and `low`:
 
 ```ruby
+set :sidekiq_processes, 2
 set :sidekiq_options_per_process, ["--queue high", "--queue default --queue low"]
 ```
 
@@ -108,6 +108,12 @@ Set init system to systemd in the cap deploy config:
 set :init_system, :systemd
 ```
 
+Enable lingering for systemd user account
+
+```
+loginctl enable-linger USERACCOUNT
+```
+
 Install systemd.service template file and enable the service with:
 
 ```
@@ -120,6 +126,19 @@ Default name for the service file is `sidekiq-stage.service`. This can be change
 set :service_unit_name, "sidekiq-#{fetch(:application)}-#{fetch(:stage)}.service"
 ```
 
+## Integration with upstart
+
+Set init system to upstart in the cap deploy config:
+
+```ruby
+set :init_system, :upstart
+```
+
+Set upstart service name:
+```ruby
+set :upstart_service_name, 'sidekiq'
+```
+
 ## Customizing the monit sidekiq templates
 
 If you need change some config in redactor, you can

data/capistrano-sidekiq.gemspec

@@ -18,5 +18,5 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'capistrano', '>= 3.9.0'
-  spec.add_dependency 'sidekiq', '>= 3.4'
+  spec.add_dependency 'sidekiq', '>= 3.4', "< 6.0"
 end

data/lib/capistrano/sidekiq/version.rb

@@ -1,3 +1,3 @@
 module Capistrano
-  SidekiqVERSION = '1.0.2'
+  SidekiqVERSION = '1.0.3'
 end

data/lib/capistrano/tasks/monit.rake

@@ -1,7 +1,7 @@
 namespace :load do
   task :defaults do
     set :sidekiq_monit_conf_dir, '/etc/monit/conf.d'
-    set :sidekiq_monit_conf_file, "#{sidekiq_service_name}.conf"
+    set :sidekiq_monit_conf_file, -> { "#{sidekiq_service_name}.conf" }
     set :sidekiq_monit_use_sudo, true
     set :monit_bin, '/usr/bin/monit'
     set :sidekiq_monit_default_hooks, true

data/lib/capistrano/tasks/sidekiq.rake

@@ -20,6 +20,7 @@ namespace :load do
     set :init_system, -> { nil }
     # systemd integration
     set :service_unit_name, "sidekiq-#{fetch(:stage)}.service"
+    set :upstart_service_name, "sidekiq"
   end
 end
 
@@ -44,6 +45,8 @@ namespace :sidekiq do
         case fetch(:init_system)
         when :systemd
           execute :systemctl, "--user", "reload", fetch(:service_unit_name), raise_on_non_zero_exit: false
+        when :upstart
+          sudo :service, fetch(:upstart_service_name), :reload
         else
           if test("[ -d #{release_path} ]")
             each_process_with_index(reverse: true) do |pid_file, _idx|
@@ -64,6 +67,8 @@ namespace :sidekiq do
         case fetch(:init_system)
         when :systemd
           execute :systemctl, "--user", "stop", fetch(:service_unit_name)
+        when :upstart
+          sudo :service, fetch(:upstart_service_name), :stop
         else
           if test("[ -d #{release_path} ]")
             each_process_with_index(reverse: true) do |pid_file, _idx|
@@ -84,6 +89,8 @@ namespace :sidekiq do
         case fetch(:init_system)
         when :systemd
           execute :systemctl, '--user', 'start', fetch(:service_unit_name)
+        when :upstart
+          sudo :service, fetch(:upstart_service_name), :start
         else
           each_process_with_index do |pid_file, idx|
             unless pid_file_exists?(pid_file) && process_exists?(pid_file)

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

@@ -5,6 +5,6 @@ check process <%= sidekiq_service_name(idx) %>
   start program = "/bin/su - <%= sidekiq_user(@role) %> -c 'cd <%= current_path %> && <%= SSHKit.config.command_map[:sidekiq] %> <%= sidekiq_config %> --index <%= idx %> --pidfile <%= pid_file %> --environment <%= fetch(:sidekiq_env) %> <%= sidekiq_concurrency %> <%= sidekiq_logfile %> <%= sidekiq_require %> <%= sidekiq_queues %> <%= sidekiq_options_per_process[idx] %> -d'" with timeout 30 seconds
 
   stop program = "/bin/su - <%= sidekiq_user(@role) %> -c 'cd <%= current_path %> && <%= SSHKit.config.command_map[:sidekiqctl] %> stop <%= pid_file %>'" with timeout <%= fetch(:sidekiq_timeout).to_i + 10  %> seconds
-  group <%= fetch(:sidekiq_monit_group, fetch(:application)) %>-sidekiq
+  group <%= fetch(:sidekiq_monit_group) || fetch(:application) %>-sidekiq
 
 <% end %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-sidekiq
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Abdelkader Boudih
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-12 00:00:00.000000000 Z
+date: 2019-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -31,6 +31,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -38,6 +41,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 description: Sidekiq integration for Capistrano
 email:
 - terminale@gmail.com
@@ -81,8 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Sidekiq integration for Capistrano