delayed_job_master 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97335497d66ae19f719fdfd655d184507e985b42
-  data.tar.gz: d723ca1ed73489e737cf2653e4685ab0644a4a26
+  metadata.gz: ac6f45642e4c4848deea50d7819bfef1f0d17b8c
+  data.tar.gz: ac6ba6a5386a2f3d2cb72f495ce5c4bc06f5e266
 SHA512:
-  metadata.gz: 56e8b33e80dee3d82b370f3275cc638fee882a458260c5304977c9379fcb6523aec185231038e0629fefb090c78d960ed4fa28e674e4b1a38d702b0492dacce0
-  data.tar.gz: 4b26b8ffbe453683d07809afc5a968dcb115429b0c41a1b2593da12996e5ba1d814e65126d9afa63ad63ae52d353322be2f02385ce4e630e7ff849e549d522be
+  metadata.gz: 74016c0784861d3f3b2c43b8ff6bc2cd2dfe2252918f4848d752073218aea50b53bb372307e823c9f9b3cf8dc596d5617a0b1d0740e1d12873e289e0fcc074c3
+  data.tar.gz: 9ca2c253636b19f8810ba693ea9bc5c8ac6d2b8278a33aec12af5548cb17712f1f90cd0d94e8025daac1c539ffb805b84ee497ce86cdcd95cb61636b7ce1cdcb

data/.travis.yml

@@ -2,8 +2,8 @@ language: ruby
 services:
   - mongodb
 rvm:
-  - 2.3.4
-  - 2.4.1
+  - 2.3
+  - 2.4
 gemfile:
   - gemfiles/active_record.gemfile
   - gemfiles/mongoid.gemfile

data/README.md

@@ -16,7 +16,7 @@ A simple delayed_job master process to control multiple workers.
 * ruby 2.3+
 * delayed_job 4.1
 
-Supported delayed_job backends:
+## Supported delayed_job backends
 
 * delayed_job_active_record 4.1
 * delayed_job_mongoid 2.3
@@ -33,9 +33,9 @@ And then execute:
 
     $ bundle
 
-Create default files:
+Create config files:
 
-    $ rails generate delayed_job_master
+    $ rails generate delayed_job_master:config
 
 This command creates `bin/delayed_job_master` and `config/delayed_job_master.rb`.
 
@@ -96,6 +96,13 @@ end
 after_fork do |master, worker_info|
   Delayed::Worker.after_fork if defined?(Delayed::Worker)
 end
+
+before_monitor do |master|
+  ActiveRecord::Base.connection.verify! if defined?(ActiveRecord::Base)
+end
+
+after_monitor do |master|
+end
 ```
 
 ## Usage

data/lib/delayed/master/callback.rb

@@ -2,7 +2,7 @@ module Delayed
   class Master
     class Callback
       def initialize(config = {})
-        @config = config.select { |k, _| [:before_fork, :after_fork].include?(k) }
+        @config = config.select { |k, _| Delayed::Master::DSL::CALLBACK_CONFIGS.include?(k) }
       end
 
       def run(name, *args)

data/lib/delayed/master/dsl.rb

@@ -2,7 +2,7 @@ module Delayed
   class Master
     class DSL
       SIMPLE_CONFIGS   = [:working_directory, :log_file, :log_level, :pid_file, :monitor_wait]
-      CALLBACK_CONFIGS = [:before_fork, :after_fork]
+      CALLBACK_CONFIGS = [:before_fork, :after_fork, :before_monitor, :after_monitor]
 
       attr_reader :config
 

data/lib/delayed/master/signal_handler.rb

@@ -30,14 +30,18 @@ module Delayed
       def dispatch(signal)
         @worker_infos.each do |worker_info|
           next unless worker_info.pid
-          begin
-            Process.kill signal, worker_info.pid
-            @logger.info "sent #{signal} signal to worker #{worker_info.pid}"
-          rescue
-            @logger.error "failed to send #{signal} signal to worker #{worker_info.pid}"
-          end
+          dispatch_to(signal, worker_info.pid)
         end
       end
+
+      private
+
+      def dispatch_to(signal, pid)
+        Process.kill signal, pid
+        @logger.info "sent #{signal} signal to worker #{pid}"
+      rescue
+        @logger.error "failed to send #{signal} signal to worker #{pid}"
+      end
     end
   end
 end

data/lib/delayed/master/version.rb

@@ -1,5 +1,5 @@
 module Delayed
   class Master
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
 end

data/lib/delayed/master/worker_pool.rb

@@ -27,8 +27,10 @@ module Delayed
       def monitor_while(&block)
         loop do
           break if block.call
-          check_pid
-          check_dynamic_worker
+          monitor do
+            check_pid
+            check_dynamic_worker
+          end
           sleep @config.monitor_wait.to_i
         end
       end
@@ -63,6 +65,14 @@ module Delayed
         worker
       end
 
+      def monitor
+        @callback.run(:before_monitor, @master)
+        yield
+        @callback.run(:after_monitor, @master)
+      rescue Exception => e
+        @logger.warn "#{e.class}: #{e.message} at #{__FILE__}: #{__LINE__}"
+      end
+
       def check_pid
         pid = wait_pid
         return unless pid

data/lib/delayed/worker/plugins/memory_checker.rb

@@ -1,13 +1,17 @@
 require 'get_process_mem'
 
-class Delayed::Plugins::WorkerMemoryChecker < Delayed::Plugin
-  callbacks do |lifecycle|
-    lifecycle.after(:perform) do |worker, job|
-      next unless worker.max_memory
-      mem = GetProcessMem.new
-      if mem.mb > worker.max_memory
-        worker.master_logger.info "shutting down worker #{Process.pid} because it consumes large memory #{mem.mb.to_i} MB..."
-        worker.stop
+module Delayed
+  module Plugins
+    class WorkerMemoryChecker < Delayed::Plugin
+      callbacks do |lifecycle|
+        lifecycle.after(:perform) do |worker, job|
+          next unless worker.max_memory
+          mem = GetProcessMem.new
+          if mem.mb > worker.max_memory
+            worker.master_logger.info "shutting down worker #{Process.pid} because it consumes large memory #{mem.mb.to_i} MB..."
+            worker.stop
+          end
+        end
       end
     end
   end

data/lib/delayed/worker/plugins/signal_handler.rb

@@ -1,26 +1,30 @@
-class Delayed::Plugins::SignalHandler < Delayed::Plugin
-  callbacks do |lifecycle|
-    lifecycle.before(:execute) do |worker|
-      worker.instance_eval do
-        trap('USR1') do
-          Thread.new do
-            master_logger.info "reopening files..."
-            Delayed::Util::FileReopener.reopen
-            master_logger.info "reopened"
+module Delayed
+  module Plugins
+    class SignalHandler < Delayed::Plugin
+      callbacks do |lifecycle|
+        lifecycle.before(:execute) do |worker|
+          worker.instance_eval do
+            trap('USR1') do
+              Thread.new do
+                master_logger.info "reopening files..."
+                Delayed::Util::FileReopener.reopen
+                master_logger.info "reopened"
+              end
+            end
+            trap('USR2') do
+              Thread.new do
+                $0 = "#{$0} [OLD]"
+                master_logger.info "shutting down worker #{Process.pid}..."
+                stop
+              end
+            end
           end
         end
-        trap('USR2') do
-          Thread.new do
-            $0 = "#{$0} [OLD]"
-            master_logger.info "shutting down worker #{Process.pid}..."
-            stop
-          end
+        lifecycle.after(:execute) do |worker|
+          worker.master_logger.info "shut down worker #{Process.pid}"
         end
       end
     end
-    lifecycle.after(:execute) do |worker|
-      worker.master_logger.info "shut down worker #{Process.pid}"
-    end
   end
 end
 

data/lib/delayed/worker/plugins/status_notifier.rb

@@ -1,11 +1,15 @@
-class Delayed::Plugins::StatusNotifier < Delayed::Plugin
-  callbacks do |lifecycle|
-    lifecycle.around(:perform) do |worker, job, &block|
-      title = $0
-      $0 = "#{title} [BUSY]"
-      ret = block.call
-      $0 = title
-      ret
+module Delayed
+  module Plugins
+    class StatusNotifier < Delayed::Plugin
+      callbacks do |lifecycle|
+        lifecycle.around(:perform) do |worker, job, &block|
+          title = $0
+          $0 = "#{title} [BUSY]"
+          ret = block.call
+          $0 = title
+          ret
+        end
+      end
     end
   end
 end

data/lib/generators/delayed_job_master/config_generator.rb

@@ -0,0 +1,16 @@
+require 'rails/generators'
+
+module DelayedJobMaster
+  class ConfigGenerator < Rails::Generators::Base
+    source_root File.join(File.dirname(__FILE__), 'templates')
+
+    def create_script_file
+      template 'script', 'bin/delayed_job_master'
+      chmod 'bin/delayed_job_master', 0o755
+    end
+
+    def create_config_file
+      template 'config.rb', 'config/delayed_job_master.rb'
+    end
+  end
+end

data/lib/generators/{templates → delayed_job_master/templates}/config.rb

@@ -50,3 +50,10 @@ end
 after_fork do |master, worker_info|
   Delayed::Worker.after_fork if defined?(Delayed::Worker)
 end
+
+before_monitor do |master|
+  ActiveRecord::Base.connection.verify! if defined?(ActiveRecord::Base)
+end
+
+after_monitor do |master|
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: delayed_job_master
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Yoshikazu Kaneta
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-06 00:00:00.000000000 Z
+date: 2017-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: delayed_job
@@ -170,9 +170,9 @@ files:
 - lib/delayed/worker/plugins/memory_checker.rb
 - lib/delayed/worker/plugins/signal_handler.rb
 - lib/delayed/worker/plugins/status_notifier.rb
-- lib/generators/delayed_job_master_generator.rb
-- lib/generators/templates/config.rb
-- lib/generators/templates/script
+- lib/generators/delayed_job_master/config_generator.rb
+- lib/generators/delayed_job_master/templates/config.rb
+- lib/generators/delayed_job_master/templates/script
 homepage: https://github.com/kanety/delayed_job_master
 licenses:
 - MIT

data/lib/generators/delayed_job_master_generator.rb

@@ -1,14 +0,0 @@
-require 'rails/generators'
-
-class DelayedJobMasterGenerator < Rails::Generators::Base
-  source_root File.join(File.dirname(__FILE__), 'templates')
-
-  def create_script_file
-    template 'script', 'bin/delayed_job_master'
-    chmod 'bin/delayed_job_master', 0o755
-  end
-
-  def create_config_file
-    template 'config.rb', 'config/delayed_job_master.rb'
-  end
-end