sidekiq-runner 0.1.1 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4b7fa70811b720ebc2ab7a34f674df39ce1f2816
-  data.tar.gz: 61bbd1e7ba1e5b094f0b0b4dd3b9b8f2cef8cde9
+SHA256:
+  metadata.gz: accd017e5f1993d88519d7a5b8652765723b0040cf58807f84ddfe313ac250c6
+  data.tar.gz: 4b94a7588b6faaeb817c95322a0073cebbbf3876f1bbf75a41132296a592c923
 SHA512:
-  metadata.gz: 1e15d46d709d85d15832e1595a0601ffc77c7cc60b71dda140a5d92fa9d2644252c46f84e04e594f9880799f6680a9c0b68b00ba5455c5370479eaa6de1a6f7d
-  data.tar.gz: 9728647c72592024dba383849ded7f4ed3dc658ceb28cb09b944a7926f9314d0518422441b06a12e7dcb3690b009ec2363b546bb6ec746bf5d5c1edbaa29e211
+  metadata.gz: b114badfa21c9f2a25600e7aa5966e963c84238a4da58ce909928695a496f6ea8778e11969ebc12de5223ddc69543831f9f05e26d8592d6d6340f653c3798b31
+  data.tar.gz: d848fbdbb4880b0068f5347abd3367cb72f5438a4529c47e0d03b74be8ae3d8acc11f41f5790d7af5ffa6c91b430f1ba46e679e37ad9c15c5c2e56936ed50a84

data/lib/sidekiq-runner.rb

@@ -17,7 +17,7 @@ module SidekiqRunner
 
     abort 'God is already running.' if god_alive?(god_config)
 
-    run(:start, sidekiq_config) do
+    run(:start, sidekiq_config, god_config) do
       $0 = "SidekiqRunner/God (#{god_config.process_name})"
 
       puts 'Starting god.'
@@ -31,7 +31,7 @@ module SidekiqRunner
   def self.stop
     sidekiq_config, god_config = SidekiqConfiguration.get, GodConfiguration.get
 
-    run(:stop, sidekiq_config) do
+    run(:stop, sidekiq_config, god_config) do
       God::EventHandler.load
 
       if god_alive?(god_config)
@@ -69,7 +69,7 @@ module SidekiqRunner
     true
   end
 
-  def self.run(action, sidekiq_config)
+  def self.run(action, sidekiq_config, god_config)
     begin
 
       # Use this flag to actually load all of the god infrastructure.
@@ -77,6 +77,11 @@ module SidekiqRunner
       require 'god'
       require 'god/cli/run'
 
+      if [:start, :stop].include? action
+        cb = god_config.send("before_#{action}_cb".to_sym)
+        cb.call if cb
+      end
+
       # Peform the action.
       yield if block_given?
 

data/lib/sidekiq-runner/god_configuration.rb

@@ -15,13 +15,14 @@ module SidekiqRunner
     RUNNER_ATTRIBUTES = [:config_file, :daemonize, :port, :syslog, :events]
     RUNNER_ATTRIBUTES.each { |att| attr_accessor att }
 
-    CONFIG_FILE_ATTRIBUTES = [:process_name, :interval, :stop_timeout, :log_file]
+    CONFIG_FILE_ATTRIBUTES = [:process_name, :interval, :stop_timeout, :log_file, :log_level, :maximum_memory_usage, :pid]
     CONFIG_FILE_ATTRIBUTES.each { |att| attr_accessor att }
 
     def initialize
       @process_name = 'sidekiq'
       @interval  = 30
       @stop_timeout = 30
+      @maximum_memory_usage = nil
 
       @log_file   = File.join(Dir.pwd, 'log', 'god.log')
       @config_file  = File.join(Dir.pwd, 'config', 'god.yml')
@@ -29,8 +30,10 @@ module SidekiqRunner
       @daemonize = true
       @syslog = true
       @events = true
+      @pid = nil
+      @log_level = :warn
 
-      # This is going to be a part of the .sock file name e.g. "/tmp/god.17165.sock"
+      # 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
     end
@@ -44,7 +47,9 @@ module SidekiqRunner
         syslog: @syslog,
         events: @events,
         config: File.expand_path("../sidekiq.god", __FILE__),
-        log: @log_file
+        log: @log_file,
+        pid: @pid,
+        log_level: @log_level
       }
     end
 
@@ -61,5 +66,13 @@ module SidekiqRunner
     def create_directories!
       FileUtils.mkdir_p(File.dirname(log_file))
     end
+
+    %w(start stop).each do |action|
+      attr_reader "before_#{action}_cb".to_sym
+
+      define_method("before_#{action}") do |&block|
+        instance_variable_set("@before_#{action}_cb".to_sym, block)
+      end
+    end
   end
 end

data/lib/sidekiq-runner/sidekiq.god

@@ -21,6 +21,10 @@ sidekiq_config.each do |name, skiq|
     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
+
     # Working directory has to be set properly.
     # Be aware that by default, God sets the working directory to / (root dir).
     w.dir = skiq.chdir || (defined?(Rails) ? Rails.root : Dir.pwd)
@@ -61,6 +65,21 @@ sidekiq_config.each do |name, skiq|
       end
     end
 
+    # Monitor process memory usage.
+    if god_config.maximum_memory_usage
+      w.restart_if do |restart|
+        restart.condition(:memory_usage) do |c|
+          c.above = god_config.maximum_memory_usage.to_i.megabytes
+          c.times = 3
+          c.interval = god_config.interval
+        end
+      end
+    end
+
+    if skiq.config_blocks.length > 0
+      skiq.config_blocks.each { |blk| blk.call(w) }
+    end
+
     w.lifecycle do |on|
       on.condition(:flapping) do |c|
         c.to_state = [:start, :restart] # If this watch is started or restarted...

data/lib/sidekiq-runner/sidekiq_instance.rb

@@ -4,10 +4,10 @@ module SidekiqRunner
     RUNNER_ATTRIBUTES = [:bundle_env, :chdir, :requirefile]
     RUNNER_ATTRIBUTES.each { |att| attr_accessor att }
 
-    CONFIG_FILE_ATTRIBUTES = [:concurrency, :verbose, :pidfile, :logfile, :tag]
+    CONFIG_FILE_ATTRIBUTES = [:concurrency, :verbose, :pidfile, :logfile, :tag, :rbtrace, :uid, :gid]
     CONFIG_FILE_ATTRIBUTES.each { |att| attr_accessor att }
 
-    attr_reader :name, :queues
+    attr_reader :name, :queues, :config_blocks
 
     def initialize(name)
       fail "No sidekiq instance name given!" if name.empty?
@@ -23,6 +23,10 @@ module SidekiqRunner
       @concurrency  = 4
       @verbose      = false
       @tag          = name
+      @rbtrace      = false
+      @uid          = nil
+      @gid          = nil
+      @config_blocks = []
     end
 
     def add_queue(queue_name, weight = 1)
@@ -32,6 +36,10 @@ module SidekiqRunner
       @queues << [queue_name, weight]
     end
 
+    def god_config(&block)
+      @config_blocks << block
+    end
+
     def merge_config_file!(yml)
       # Get global configuration options.
       SidekiqInstance::CONFIG_FILE_ATTRIBUTES.each do |k|
@@ -57,7 +65,8 @@ module SidekiqRunner
       create_directories!
 
       cmd = []
-      cmd << (bundle_env ? 'bundle exec sidekiq' : 'sidekiq')
+      cmd << 'bundle exec' if bundle_env
+      cmd << (rbtrace ? File.expand_path('../../../script/sidekiq_rbtrace', __FILE__) : 'sidekiq')
       cmd << '-d'
       cmd << "-c #{concurrency}"
       cmd << '-v' if verbose

data/lib/sidekiq-runner/version.rb

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

data/script/sidekiq_rbtrace

@@ -0,0 +1,32 @@
+#!/usr/bin/env ruby
+
+require 'rbtrace'
+
+def sidekiq_bin
+  require 'sidekiq/cli'
+
+  begin
+    cli = Sidekiq::CLI.instance
+    cli.parse
+    cli.run
+  rescue => e
+    raise e if $DEBUG
+    STDERR.puts e.message
+    STDERR.puts e.backtrace.join("\n")
+    exit 1
+  end
+end
+
+sidekiq = `which sidekiq` rescue ''
+if sidekiq.empty?
+  # When we can't locate the Sidekiq executable, mimick
+  # its behaviour here.
+  sidekiq_bin
+else
+  begin
+    # Otherwise load the sidekiq executable.
+    load sidekiq.strip
+  rescue
+    sidekiq_bin
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-runner
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.7
 platform: ruby
 authors:
 - FlavourSys Technology GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-01 00:00:00.000000000 Z
+date: 2021-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '11'
 - !ruby/object:Gem::Dependency
   name: god
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +52,7 @@ files:
 - lib/sidekiq-runner/sidekiq_instance.rb
 - lib/sidekiq-runner/tasks.rb
 - lib/sidekiq-runner/version.rb
+- script/sidekiq_rbtrace
 homepage: https://github.com/FlavourSys/sidekiq-runner
 licenses:
 - MIT
@@ -71,8 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 3.2.16
 signing_key: 
 specification_version: 4
 summary: Sidekiq configuration and rake tasks