resque-forker 1.0.beta → 1.1.0

data/CHANGELOG

@@ -1,2 +1,10 @@
-2010-07-30 v1.0
-	Extracted from Flowtown with permission
+2010-08-11 v1.1 Accessible options.
+
+Allows accessing options from forker.
+Allows setting verbose and very_verbose options instead of being magically inferred.
+Allows passing workload to fork! method as an option.
+
+2010-08-03 v1.0 First release
+
+2010-07-30 v1.0.beta
+Extracted from Flowtown with permission

data/README.rdoc

@@ -34,10 +34,13 @@ Edit this to your needs and place it in script/workers:
       forker.logger = Rails.logger
       forker.workload = ["*"] * 4        # 4 workers on all queues
       forker.user "www-data", "www-data" # don't run as root
+      forker.options.interval = 1
+    else
+      forker.options.verbose = true
     end
   end
   # Stuff to do after forking a worker.
-  Resque.after_fork do
+  Resque.before_first_fork do
     ActiveRecord::Base.establish_connection
   end
   Resque.fork!

data/lib/resque/forker.rb

@@ -14,8 +14,10 @@ module Resque
   #     ActiveRecord::Base.connection.disconnect!
   #     forker.logger = Rails.logger
   #     forker.user "nobody", "nobody"
+  #     forker.workload = ["*"] * 8
+  #     forker.options.interval = 1
   #   end
-  #   Resque.after_fork do
+  #   Resque.before_first_fork do
   #     ActiveRecord::Base.establish_connection
   #   end
   #
@@ -27,14 +29,14 @@ module Resque
   #
   # All the forking action is handled by a single call:
   #   # Three workers, processing all queues
-  #   Resque.fork! ["*"] * 3
+  #   Resque.fork! :workload=>["*"] * 3
   #
   # The workload is specified as an array of lists of queues, that way you can
   # decide how many workers to fork (length of the array) and give each worker
   # different set of queues to work with. For example, to have four workers
   # processing import queue, and only two of these also processing export queue:
   #
-  #   Resque.fork! ["import,export", "import"] * 2
+  #   forker.workload = ["import,export", "import"] * 2
   #
   # Once the process is up and running, you control it by sending signals:
   # - kill -QUIT -- Quit gracefully
@@ -58,10 +60,14 @@ module Resque
   #   exec script/workers
   #   respawn
   class Forker
+
+    Options = Struct.new(:verbose, :very_verbose, :interval, :terminate)
+
     def initialize(options = nil)
-      @options = options || {}
-      @logger = @options[:logger] || Logger.new($stderr)
-      @workload = ["*"]
+      options ||= {}
+      @logger = options[:logger] || Logger.new($stderr)
+      @workload = options[:workload] || ["*"]
+      @options = Options[*options.values_at(*Options.members)]
       @children = []
       begin
         require "system_timer"
@@ -79,6 +85,9 @@ module Resque
     # Defaults to stderr, but you may want to point this at Rails logger.
     attr_accessor :logger
 
+    # Most options can be changed from the Resque.setup hook. See Options.
+    attr_reader :options
+
     # Run and never return.
     def run
       @logger.info "** Running as #{Process.pid}"
@@ -149,9 +158,9 @@ module Resque
     # Run and never return.
     def run_worker(queues)
       worker = Resque::Worker.new(*queues.split(","))
-      worker.verbose = $VERBOSE
-      worker.very_verbose = $DEBUG
-      worker.work(@options[:interval] || 5) # interval, will block
+      worker.verbose = options.verbose
+      worker.very_verbose = options.very_verbose
+      worker.work(options.interval || 5) # interval, will block
     end
 
     # Stop child processes and run any teardown action.
@@ -166,7 +175,7 @@ module Resque
       end
       reap_children
       if teardown = Resque.teardown
-        @timeout.call @options[:terminate] || 5 do
+        @timeout.call options.terminate || 5 do
           begin
             teardown.call self
           rescue Exception
@@ -224,9 +233,12 @@ module Resque
   # - :logger -- Which Logger to use (default logger to stdout)
   # - :interval -- Processing interval (default to 5 seconds)
   # - :terminate -- Timeout running teardown block (default to 5 seconds)
-  def fork!(workload = nil, options = nil)
-    forker = Resque::Forker.new(options)
-    forker.workload = workload if workload
-    forker.run
+  # - :verbose -- Be verbose.
+  # - :very_verbose -- Make :verbose look quiet.
+  # - :workload -- The initial workload.
+  #
+  # You can also set these options from the Resque.setup hook.
+  def fork!(options = nil)
+    Resque::Forker.new(options).run
   end
 end

data/resque-forker.gemspec

@@ -1,9 +1,9 @@
 Gem::Specification.new do |spec|
   spec.name           = "resque-forker"
-  spec.version        = "1.0.beta"
+  spec.version        = "1.1.0"
   spec.author         = "Assaf Arkin"
   spec.email          = "assaf@labnotes.org"
-  spec.homepage       = "http://github.com/assaf/resque-forker"
+  spec.homepage       = "http://github.com/flowtown/resque-forker"
   spec.summary        = "Super awesome forking action for Resque workers"
   spec.post_install_message = ""
 
@@ -11,8 +11,7 @@ Gem::Specification.new do |spec|
 
   spec.has_rdoc         = true
   spec.extra_rdoc_files = "README.rdoc", "CHANGELOG"
-  spec.rdoc_options     = "--title", "Resque Forker  #{spec.version}", "--main", "README.rdoc",
-                          "--webcvs", "http://github.com/assaf/#{spec.name}"
+  spec.rdoc_options     = "--title", "Resque Forker  #{spec.version}", "--main", "README.rdoc", "--webcvs", spec.homepage
 
   spec.required_ruby_version = '>= 1.8.7'
   spec.add_dependency "resque"

data/script/workers

@@ -9,10 +9,13 @@ Resque.setup do |forker|
     forker.logger = Rails.logger
     forker.workload = ["*"] * 4        # 4 workers on all queues
     forker.user "www-data", "www-data" # don't run as root
+    forker.options.interval = 1
+  else
+    forker.options.verbose = true
   end
 end
 # Stuff to do after forking a worker.
-Resque.after_fork do
+Resque.before_first_fork do
   ActiveRecord::Base.establish_connection
 end
 Resque.fork!

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: resque-forker
 version: !ruby/object:Gem::Version 
-  hash: 31098137
-  prerelease: true
+  hash: 19
+  prerelease: false
   segments: 
   - 1
+  - 1
   - 0
-  - beta
-  version: 1.0.beta
+  version: 1.1.0
 platform: ruby
 authors: 
 - Assaf Arkin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-30 00:00:00 -07:00
+date: 2010-08-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,17 +50,17 @@ files:
 - Rakefile
 - resque-forker.gemspec
 has_rdoc: true
-homepage: http://github.com/assaf/resque-forker
+homepage: http://github.com/flowtown/resque-forker
 licenses: []
 
 post_install_message: ""
 rdoc_options: 
 - --title
-- Resque Forker  1.0.beta
+- Resque Forker  1.1.0
 - --main
 - README.rdoc
 - --webcvs
-- http://github.com/assaf/resque-forker
+- http://github.com/flowtown/resque-forker
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -77,14 +77,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: