sidekiq-runner 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40e3ccfb608ce10065ae202f0c2115beb6d12731
-  data.tar.gz: 666ab8b6d2581309f11c082848bbb24e5e2ec1f8
+  metadata.gz: 65f6d473c59401d2c4206a1f1a5a91ac53baa55c
+  data.tar.gz: 5d56060902cd554d9928969e995d42df9ae55803
 SHA512:
-  metadata.gz: 070bba932a4942753c19bf5e585da2f600bae70d89d757dd5989a8e7ac71cb13f30b91d02773f0128b733e225d75747e53e4f7b41f2f03e5fc3fc7e950d9501a
-  data.tar.gz: 992af79e5d6b807afeaef9382b68fb6a7376e43d85dbf73636373318ff0358ce01225267e69700dc1dc306aba284a43fa46968305bdea2be717d77060ce9ba5b
+  metadata.gz: 0c541c8fde7042c286e4c872c218f003c05b8c68e0b31272e653e47a256d62b647add742bd2448cbce71b2685d778de6275ba995e96c43ac6c6afcdfc29eabb9
+  data.tar.gz: 81cf308cec2a49fdf3aa855595bb14220f98de69ecd574f3b713adbc9a4dc283826984b3f9710af8a14e004c82fc4de928de076c262c53e13d7c2a5da6541689

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,7 +15,7 @@ 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, :maximum_memory_usage, :pid]
+    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
@@ -31,6 +31,7 @@ module SidekiqRunner
       @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" and the pidfile name
       # Change this in the configuration file to be able to run multiple instances of god.
@@ -47,7 +48,8 @@ module SidekiqRunner
         events: @events,
         config: File.expand_path("../sidekiq.god", __FILE__),
         log: @log_file,
-        pid: @pid
+        pid: @pid,
+        log_level: @log_level
       }
     end
 
@@ -64,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

@@ -76,6 +76,10 @@ sidekiq_config.each do |name, skiq|
       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

@@ -7,7 +7,7 @@ module SidekiqRunner
     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?
@@ -26,6 +26,7 @@ module SidekiqRunner
       @rbtrace      = false
       @uid          = nil
       @gid          = nil
+      @config_blocks = []
     end
 
     def add_queue(queue_name, weight = 1)
@@ -35,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|

data/lib/sidekiq-runner/version.rb

@@ -1,3 +1,3 @@
 module SidekiqRunner
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-runner
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - FlavourSys Technology GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-19 00:00:00.000000000 Z
+date: 2016-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -73,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Sidekiq configuration and rake tasks