sidekiq-runner 0.1.7 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: accd017e5f1993d88519d7a5b8652765723b0040cf58807f84ddfe313ac250c6
-  data.tar.gz: 4b94a7588b6faaeb817c95322a0073cebbbf3876f1bbf75a41132296a592c923
+  metadata.gz: c8918e2e7486207c0a59ae645ec003d7ce1de255ba8e60e48ae9265e3db829b9
+  data.tar.gz: 7931bf1755ef7b945443ea9a6b9c73199e88b3ad5d05e0975baf9b4cd7798480
 SHA512:
-  metadata.gz: b114badfa21c9f2a25600e7aa5966e963c84238a4da58ce909928695a496f6ea8778e11969ebc12de5223ddc69543831f9f05e26d8592d6d6340f653c3798b31
-  data.tar.gz: d848fbdbb4880b0068f5347abd3367cb72f5438a4529c47e0d03b74be8ae3d8acc11f41f5790d7af5ffa6c91b430f1ba46e679e37ad9c15c5c2e56936ed50a84
+  metadata.gz: cf8d8f5617fa3eea88088bc14202ccb52a252e4c2e2ba9b7c53c455a9b6929e2218668e5a1b1790c2af42246dae8572b942a65ea645b242a8b53fede15fbad99
+  data.tar.gz: 861b4a172a2c35d738e12b178b9550b9df09d927cf1772a1a3866fc6564ba162d3aad5cb3337a5e21742e86ad417b6d97df2c5991c015031a1db8c41e7622204

data/lib/sidekiq-runner.rb

@@ -48,6 +48,17 @@ module SidekiqRunner
     end
   end
 
+  def self.restart(sidekiq_instances: [])
+    sidekiq_config = SidekiqConfiguration.get
+    god_config = GodConfiguration.get
+
+    return unless god_alive?(god_config)
+
+    sidekiq_config.each_key do |name|
+      God::CLI::Command.new('restart', god_config.options, ['', name]) if sidekiq_instances.empty? || sidekiq_instances.include?(name.to_sym)
+    end
+  end
+
   def self.running?
     god_alive? GodConfiguration.get
   end
@@ -86,12 +97,12 @@ module SidekiqRunner
       yield if block_given?
 
     rescue SystemExit => e
-      cb = e.success? ? "#{action}_success_cb" : "#{action}_error_cb"
+      sidekiq_cb = e.success? ? "#{action}_success_cb" : "#{action}_error_cb"
     ensure
       if [:start, :stop].include? action
-        cb = "#{action}_success_cb" unless cb
-        cb = sidekiq_config.send(cb.to_sym)
-        cb.call if cb
+        sidekiq_cb = "#{action}_success_cb" unless sidekiq_cb
+        sidekiq_cb = sidekiq_config.send(sidekiq_cb.to_sym)
+        sidekiq_cb.call if sidekiq_cb
       end
     end
   end

data/lib/sidekiq-runner/god_configuration.rb

@@ -18,6 +18,8 @@ module SidekiqRunner
     CONFIG_FILE_ATTRIBUTES = [:process_name, :interval, :stop_timeout, :log_file, :log_level, :maximum_memory_usage, :pid]
     CONFIG_FILE_ATTRIBUTES.each { |att| attr_accessor att }
 
+    attr_reader :generic_watchers
+
     def initialize
       @process_name = 'sidekiq'
       @interval  = 30
@@ -36,6 +38,12 @@ module SidekiqRunner
       # This is going to be a part of the .sock file name e.g. "/tmp/god.17165.sock" and the pidfile name
       # Change this in the configuration file to be able to run multiple instances of god.
       @port = 17165
+
+      @generic_watchers = []
+    end
+
+    def add_generic(&blk)
+      @generic_watchers << blk
     end
 
     def options
@@ -64,7 +72,7 @@ module SidekiqRunner
     end
 
     def create_directories!
-      FileUtils.mkdir_p(File.dirname(log_file))
+      FileUtils.mkdir_p(File.dirname(log_file)) if log_file
     end
 
     %w(start stop).each do |action|

data/lib/sidekiq-runner/sidekiq.god

@@ -6,6 +6,12 @@ god_config = SidekiqRunner::GodConfiguration.get
 
 God.terminate_timeout = god_config.stop_timeout + 10
 
+god_config.generic_watchers.each do |block|
+  God.watch do |w|
+    block.call(w)
+  end
+end
+
 sidekiq_config.each do |name, skiq|
   God.watch do |w|
     w.name = name
@@ -13,14 +19,12 @@ sidekiq_config.each do |name, skiq|
     # Set start command.
     w.start = skiq.build_start_command
 
+    # Set logfile
+    w.log = skiq.logfile
+
     # Set stop command.
-    w.stop = skiq.build_stop_command(god_config.stop_timeout)
     w.stop_timeout = god_config.stop_timeout
 
-    # Make sure the pidfile is deleted as sidekiqctl does not delete stale pidfiles.
-    w.pid_file = skiq.pidfile
-    w.behavior(:clean_pid_file)
-
     # Set uid/gid if requested.
     w.uid = skiq.uid if skiq.uid
     w.gid = skiq.gid if skiq.gid

data/lib/sidekiq-runner/sidekiq_configuration.rb

@@ -12,7 +12,7 @@ module SidekiqRunner
     def initialize
       @config_file =
         if defined?(Rails)
-          File.join(Rails.root, 'config', 'sidekiq.yml')  
+          File.join(Rails.root, 'config', 'sidekiq.yml')
         else
           File.join(Dir.pwd, 'config', 'sidekiq.yml')
         end
@@ -86,8 +86,6 @@ module SidekiqRunner
     end
 
     def merge_config_file!
-      sidekiqs_common_config = {}
-
       yml = File.exist?(config_file) ? YAML.load_file(config_file) : {}
       yml = Hash[yml.map { |k, v| [k.to_sym, v] }]
 
@@ -96,8 +94,6 @@ module SidekiqRunner
 
     def sane?
       fail 'No sidekiq instances defined. Nothing to run.' if @sidekiqs.empty?
-      fail 'Sidekiq instances with the same pidfile found.' if @sidekiqs.values.map(&:pidfile).uniq.size < @sidekiqs.size
-      fail 'Sidekiq instances with the same logfile found.' if @sidekiqs.values.map(&:logfile).uniq.size < @sidekiqs.size
 
       @sidekiqs.each_value { |skiq| skiq.sane? }
     end

data/lib/sidekiq-runner/sidekiq_instance.rb

@@ -1,6 +1,5 @@
 module SidekiqRunner
   class SidekiqInstance
-
     RUNNER_ATTRIBUTES = [:bundle_env, :chdir, :requirefile]
     RUNNER_ATTRIBUTES.each { |att| attr_accessor att }
 
@@ -10,7 +9,7 @@ module SidekiqRunner
     attr_reader :name, :queues, :config_blocks
 
     def initialize(name)
-      fail "No sidekiq instance name given!" if name.empty?
+      raise "No sidekiq instance name given!" if name.empty?
 
       @name = name
       @queues = []
@@ -30,9 +29,10 @@ module SidekiqRunner
     end
 
     def add_queue(queue_name, weight = 1)
-      fail "Cannot add the queue. The name is empty!" if queue_name.empty?
-      fail "Cannot add the queue. The weight is not an integer!" unless weight.is_a? Integer
-      fail "Cannot add the queue. The queue with \"#{queue_name}\" name already exist" if @queues.any? { |q| q.first == queue_name }
+      raise "Cannot add the queue. The name is empty!" if queue_name.empty?
+      raise "Cannot add the queue. The weight is not an integer!" unless weight.is_a? Integer
+      raise "Cannot add the queue. The queue with \"#{queue_name}\" name already exist" if @queues.any? { |q| q.first == queue_name }
+
       @queues << [queue_name, weight]
     end
 
@@ -47,7 +47,7 @@ module SidekiqRunner
       end
 
       # Override with instance-specific options.
-      if (syml = yml[@name.to_sym]) && (syml.is_a?(Hash))
+      if (syml = yml[@name.to_sym]) && syml.is_a?(Hash)
         syml = Hash[syml.map { |k, v| [k.to_sym, v] }]
 
         SidekiqInstance::CONFIG_FILE_ATTRIBUTES.each do |k|
@@ -57,8 +57,8 @@ module SidekiqRunner
     end
 
     def sane?
-      fail "No queues given for #{@name}!" if @queues.empty?  
-      fail "No requirefile given for #{@name} and not in Rails environment!" if !defined?(Rails) && !requirefile
+      raise "No queues given for #{@name}!" if @queues.empty?
+      raise "No requirefile given for #{@name} and not in Rails environment!" if !defined?(Rails) && !requirefile
     end
 
     def build_start_command
@@ -66,33 +66,21 @@ module SidekiqRunner
 
       cmd = []
       cmd << 'bundle exec' if bundle_env
-      cmd << (rbtrace ? File.expand_path('../../../script/sidekiq_rbtrace', __FILE__) : 'sidekiq')
-      cmd << '-d'
+      cmd << (rbtrace ? File.expand_path('../../script/sidekiq_rbtrace', __dir__) : 'sidekiq')
       cmd << "-c #{concurrency}"
       cmd << '-v' if verbose
-      cmd << "-L #{logfile}"
       cmd << "-P #{pidfile}"
       cmd << "-e #{Rails.env}" if defined?(Rails)
       cmd << "-r #{requirefile}" if requirefile
       cmd << "-g '#{tag}'"
 
       queues.each do |q, w|
-        cmd << "-q #{q},#{w.to_s}"
+        cmd << "-q #{q},#{w}"
       end
 
       cmd.join(' ')
     end
 
-    def build_stop_command(timeout)
-      cmd = []
-      cmd << (bundle_env ? 'bundle exec sidekiqctl' : 'sidekiqctl')
-      cmd << 'stop'
-      cmd << pidfile
-      cmd << timeout
-
-      cmd.join(' ')
-    end
-
     private
 
     def create_directories!

data/lib/sidekiq-runner/version.rb

@@ -1,3 +1,3 @@
 module SidekiqRunner
-  VERSION = '0.1.7'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-runner
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.0
 platform: ruby
 authors:
 - FlavourSys Technology GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-25 00:00:00.000000000 Z
+date: 2021-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: god
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.13'
+- !ruby/object:Gem::Dependency
+  name: sidekiq
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 description: Provide an easy way to configure, start, and monitor all your Sidekiq
   processes
 email: technology@flavoursys.com
@@ -72,7 +86,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.16
+rubyforge_project: 
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Sidekiq configuration and rake tasks