delayed_job_worker_pool 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79d4a1eeecbbf23ff19a1811faf6a8d35d9616c5
-  data.tar.gz: 99b6e576ac2ef89486b12614f171dd2db7d4588c
+  metadata.gz: f7e84e64a69a710244b682df783ea1f7f96ce72a
+  data.tar.gz: 75e5bbb9ffe986ded38517b4bb0fb72e7e5049c0
 SHA512:
-  metadata.gz: 303a786f4bbe3c5e96a23e6cd63582f321289b4b8e63489071b9502059d503cf12f2667f8891c11a2955947bf2a426831840bdd28377a7e57dec5afac4179205
-  data.tar.gz: 824d5d7e04193c7a4ed6fbddec598f378dc6f5f2ad57e39bc32700f3eb0a000e1881778aaf0fedf371607012812b10859adafd7b0606723154066ce1fc73a7c0
+  metadata.gz: 071b9234bfd7e3904bc44eb0957508a31bdd9975d644d7de77d06e3f9b0e8af5ccb0ca185c4bd9e754fde55c52698e4add16ebf873964d31d1af3101cb52d163
+  data.tar.gz: d98c55b40a03b8156d96ebfb870a56e75472101f61806dbab4b52300a6082808e225a4d4a738a689e53d0175d73688a7905e46974c9846080d05358176ca374a

data/CHANGELOG.md

@@ -0,0 +1,4 @@
+# Changelog
+
+### 0.2.0 (unreleased)
+* 

data/README.md

@@ -45,22 +45,33 @@ sleep_delay ENV['WORKER_SLEEP_DELAY']
 
 preload_app
 
-before_worker_boot do
-  puts 'Master about to start forking children'
+# This runs in the master process after it preloads the app
+after_preload_app do
+  puts "Master #{Process.pid} preloaded app"
+  
+  # Don't hang on to database connections from the master after we've 
+  # completed initialization
+  ActiveRecord::Base.connection_pool.disconnect!
 end
 
-before on_worker_boot do
+# This runs in the worker processes after it has been forked
+on_worker_boot do |worker_info|
   puts "Worker #{Process.pid} started"
   
   # Reconnect to the database
   ActiveRecord::Base.establish_connection
 end
 
-after_worker_boot do
-  puts 'Master booted children'
-  
-  # Don't hang on to database connections from the master after we've completed initialization
-  ActiveRecord::Base.connection_pool.disconnect!
+# This runs in the master process after a worker starts
+after_worker_boot do |worker_info|
+  puts "Master #{Process.pid} booted worker #{worker_info.name} with " \
+        "process id #{worker_info.process_id}"
+end
+
+# This runs in the master process after a worker shuts down
+after_worker_shutdown do |worker_info|
+  puts "Master #{Process.pid} detected dead worker #{worker_info.name} " \
+        "with process id #{worker_info.process_id}"
 end
 ```
 
@@ -69,9 +80,10 @@ Here's more information on each setting:
 * `workers` - The number of Delayed Job worker processes to fork. The master process will relaunch workers that fail.
 * Delayed Job worker settings (`queues`, `min_priority`, `max_priority`, `sleep_delay`, `read_ahead`) - These are passed through to the Delayed Job worker.
 * `preload_app` - This forces the master process to load Rails before forking worker processes causing the memory consumed by the code to be shared between workers. **If you use this setting make sure you re-establish any necessary connections in the on_worker_boot callback.**
-* `before_worker_boot` - A callback that runs in the master process before forking any workers.
+* `after_preload_app` - A callback that runs in the master process after preloading the app but before forking any workers.
 * `on_worker_boot` - A callback that runs in the worker process after it has been forked.
-* `after_worker_boot` - A callback that runs in the master process after the initial set of workers have been forked.
+* `after_worker_boot` - A callback that runs in the master process after a worker has been forked.
+* `after_worker_shutdown` - A callback that runs in the master process after a worker has been shutdown.
 
 All settings are optional and nil values are ignored. 
 

data/lib/delayed_job_worker_pool.rb

@@ -1,5 +1,6 @@
 require 'delayed_job_worker_pool/application'
 require 'delayed_job_worker_pool/dsl'
 require 'delayed_job_worker_pool/worker'
+require 'delayed_job_worker_pool/worker_info'
 require 'delayed_job_worker_pool/worker_pool'
 require 'delayed_job_worker_pool/version'

data/lib/delayed_job_worker_pool/dsl.rb

@@ -1,7 +1,7 @@
 module DelayedJobWorkerPool
   class DSL
     SIMPLE_SETTINGS = [:workers, :queues, :min_priority, :max_priority, :sleep_delay, :read_ahead].freeze
-    CALLBACK_SETTINGS = [:before_worker_boot, :on_worker_boot, :after_worker_boot].freeze
+    CALLBACK_SETTINGS = [:after_preload_app, :on_worker_boot, :after_worker_boot, :after_worker_shutdown].freeze
 
     def self.load(path)
       options = {}

data/lib/delayed_job_worker_pool/version.rb

@@ -1,3 +1,3 @@
 module DelayedJobWorkerPool
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.2.0'.freeze
 end

data/lib/delayed_job_worker_pool/worker.rb

@@ -1,9 +1,10 @@
 module DelayedJobWorkerPool
   module Worker
     extend self
-    
+
     def run(options = {})
       dj_worker = Delayed::Worker.new(options)
+      dj_worker.name = options[:name] if options.include?(:name)
       dj_worker.start
     end
   end

data/lib/delayed_job_worker_pool/worker_info.rb

@@ -0,0 +1,11 @@
+module DelayedJobWorkerPool
+  class WorkerInfo
+    attr_reader :process_id, :name
+
+    def initialize(attributes)
+      @process_id = attributes.fetch(:process_id)
+      @name = attributes.fetch(:name)
+    end
+
+  end
+end

data/lib/delayed_job_worker_pool/worker_pool.rb

@@ -11,17 +11,16 @@ module DelayedJobWorkerPool
 
       install_signal_handlers
 
-      load_app if preload_app?
-
-      invoke_callback(:before_worker_boot)
+      if preload_app?
+        load_app
+        invoke_callback(:after_preload_app)
+      end
 
       log_uninheritable_threads
 
       create_master_alive_pipe
       num_workers.times { fork_worker }
 
-      invoke_callback(:after_worker_boot)
-
       monitor_workers
 
       exit
@@ -81,18 +80,20 @@ module DelayedJobWorkerPool
 
         log("Worker #{worker_pid} exited with status #{status.to_i}")
         worker_pids.delete(worker_pid)
+        invoke_callback(:after_worker_shutdown, worker_info(worker_pid))
         fork_worker unless shutting_down
       end
     end
 
-    def invoke_callback(callback_name)
-      options[callback_name].call if options[callback_name]
+    def invoke_callback(callback_name, *args)
+      options[callback_name].call(*args) if options[callback_name]
     end
 
     def fork_worker
       worker_pid = Kernel.fork { run_worker }
       worker_pids << worker_pid
       log("Started worker #{worker_pid}")
+      invoke_callback(:after_worker_boot, worker_info(worker_pid))
     end
 
     def run_worker
@@ -106,14 +107,22 @@ module DelayedJobWorkerPool
 
       load_app unless preload_app?
 
-      invoke_callback(:on_worker_boot)
+      invoke_callback(:on_worker_boot, worker_info(Process.pid))
 
-      DelayedJobWorkerPool::Worker.run(worker_options)
+      DelayedJobWorkerPool::Worker.run(worker_options(Process.pid))
     rescue => e
       log("Worker failed with error: #{e.message}\n#{e.backtrace.join("\n")}")
       exit(1)
     end
 
+    def worker_info(worker_pid)
+      DelayedJobWorkerPool::WorkerInfo.new(name: worker_name(worker_pid), process_id: worker_pid)
+    end
+
+    def worker_name(worker_pid)
+      "host:#{Socket.gethostname} pid:#{worker_pid}"
+    end
+
     def num_workers
       options.fetch(:workers, 1)
     end
@@ -122,8 +131,8 @@ module DelayedJobWorkerPool
       options.fetch(:preload_app, false)
     end
 
-    def worker_options
-      options.except(:workers, :preload_app, :before_worker_boot, :on_worker_boot, :after_worker_boot)
+    def worker_options(worker_pid)
+      options.except(:workers, :preload_app, *DelayedJobWorkerPool::DSL::CALLBACK_SETTINGS).merge(name: worker_name(worker_pid))
     end
 
     def log(message)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: delayed_job_worker_pool
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Joel Turkel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-17 00:00:00.000000000 Z
+date: 2015-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: delayed_job
@@ -124,6 +124,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -135,6 +136,7 @@ files:
 - lib/delayed_job_worker_pool/dsl.rb
 - lib/delayed_job_worker_pool/version.rb
 - lib/delayed_job_worker_pool/worker.rb
+- lib/delayed_job_worker_pool/worker_info.rb
 - lib/delayed_job_worker_pool/worker_pool.rb
 homepage: https://github.com/salsify/delayed_job_worker_pool
 licenses: