resque-pool 0.0.12.0.alpha → 0.0.12.1.alpha

data/README.md

@@ -87,9 +87,6 @@ return something like the following:
     rails    13876 13858  0 13:44 ?        S      0:00  \_ resque-1.9.9: Forked 7485 at 1280343255
     rails     7485 13876  0 14:54 ?        S      0:00      \_ resque-1.9.9: Processing bar since 1280343254
 
-An example startup script, which redirects STDOUT and STDERR and creates a pid
-file, is given in the examples directory.
-
 SIGNALS
 -------
 
@@ -109,14 +106,21 @@ Other Features
 --------------
 
 You can run resque-pool as a daemon via `--daemon`.  It will default to placing
-the pidfile and logfiles in the rails default locations, so you may want to
-configure that.  See `resque-pool --help` for more options.  An example init.d
-script and monitrc are included, as erb templates.
+the pidfile and logfiles in the rails default locations, and you may want to
+configure that.  See `resque-pool --help` for more options.
+
+An example init.d script and monitrc are provided in
+`examples/chef_cookbook/templates/default`, as erb templates.  Just copy them
+into place, filling in the erb variables as necessary.  An example chef recipe
+is also provided (it should work at Engine Yard as is; just provide a
+`/data/#{app_name}/shared/config/resque-pool.yml` on your utility servers).
 
-You can also run `resque-pool` via the `resque:pool` rake task.
+You can also run `resque-pool` via the `resque:pool` rake task or from a plain
+old ruby script by calling `Resque::Pool.run`.
 
-Workers will watch the pool master, and gracefully shutdown if the master
-process dies (for whatever reason) before them.
+Workers will watch the pool master, and gracefully shutdown (after completing
+their current job) if the master process dies (for whatever reason) before
+them.
 
 You can specify an alternate config file by setting the `RESQUE_POOL_CONFIG`
 environment variable like so:
@@ -128,14 +132,14 @@ TODO
 
 * cmd line option for non-rake loading
 * cmd line option for preload ruby file
-* perhaps provide Unix style log formatter
+* provide Unix style log formatter
+* web interface for adding and removing workers (etc)
 * recover gracefully from a malformed config file (on startup and HUP)
 * procline for malformed config file, graceful shutdown... and other states?
-* web interface for adding and removing workers (etc)
 * figure out a good automated way to test this (cucumber or rspec?)
-* rename to `resque-squad`?
 * clean up the code (I stole most of it from unicorn, and it's still a bit
   bastardized); excessive use of vim foldmarkers are a code smell.
+* rename to `resque-squad`?
 * rdoc
 * incorporate resque-batchworker features? (v2.0)
 
@@ -143,3 +147,4 @@ Contributors
 -------------
 
 * John Schult (config file can be split by environment)
+* Stephen Celis (increased gemspec sanity)

data/examples/chef_cookbook/recipes/default.rb

@@ -1,38 +1,40 @@
 if ['solo', 'util'].include?(node[:instance_role])
+  node[:applications].each do |app, data|
 
-  template "/etc/monit.d/#{app}_resque.monitrc" do 
-    owner 'root' 
-    group 'root' 
-    mode 0644 
-    source "monitrc.erb" 
-    variables({ 
-      :app_name => app, 
-      #:max_mem  => "400 MB",
-    }) 
-  end
+    template "/etc/monit.d/#{app}_resque.monitrc" do
+      owner 'root'
+      group 'root'
+      mode 0644
+      source "monitrc.erb"
+      variables({
+        :app_name => app,
+        #:max_mem  => "400 MB",
+      })
+    end
 
-  template "/etc/init.d/#{app}_resque" do 
-    owner 'root' 
-    group 'root' 
-    mode 0744
-    source "initd.rb" 
-    variables({ 
-      :app_name => app, 
-    }) 
-  end
+    template "/etc/init.d/#{app}_resque" do
+      owner 'root'
+      group 'root'
+      mode 0744
+      source "initd.rb"
+      variables({
+        :app_name => app,
+      })
+    end
 
-  execute "enable-resque" do
-    command "rc-update add #{app}_resque default"
-    action :run
-    not_if "rc-update show | grep -q #{app}_resque.*default"
-  end
+    execute "enable-resque" do
+      command "rc-update add #{app}_resque default"
+      action :run
+      not_if "rc-update show | grep -q '^ *#{app}_resque |.*default"
+    end
 
-  execute "start-resque" do 
-    command %Q{/etc/init.d/#{app}_resque start}
-  end
+    execute "start-resque" do
+      command %Q{/etc/init.d/#{app}_resque start}
+    end
 
-  execute "ensure-resque-is-setup-with-monit" do 
-    command %Q{monit reload} 
-  end
+    execute "ensure-resque-is-setup-with-monit" do
+      command %Q{monit reload}
+    end
 
+  end
 end

data/lib/resque/pool/cli.rb

@@ -1,4 +1,5 @@
 require 'trollop'
+require 'resque/pool'
 
 module Resque
   class Pool
@@ -16,7 +17,7 @@ module Resque
 
       def parse_options
         opts = Trollop::options do
-          version "resque-pool #{Resque::Pool::VERSION} (c) nicholas a. evans"
+          version "resque-pool #{VERSION} (c) nicholas a. evans"
           banner <<-EOS
 resque-pool is the best way to manage a group (pool) of resque workers
 
@@ -33,13 +34,12 @@ where [options] are:
           opt :stderr, "Redirect stderr to logfile", :type => String,   :short => '-e'
           opt :nosync, "Don't sync logfiles on every write"
           opt :pidfile, "PID file location",         :type => String,   :short => "-p"
-          opt :environment, "Set RAILS_ENV/RACK_ENV/RESQUE_ENV",
-            :default => "development", :short => "-E"
+          opt :environment, "Set RAILS_ENV/RACK_ENV/RESQUE_ENV", :type => String, :short => "-E"
         end
         if opts[:daemon]
           opts[:stdout]  ||= "log/resque-pool.stdout.log"
           opts[:stderr]  ||= "log/resque-pool.stderr.log"
-          opts[:pidfile] ||= "resque-pool.pid"
+          opts[:pidfile] ||= "tmp/pids/resque-pool.pid"
         end
         opts
       end
@@ -77,14 +77,16 @@ where [options] are:
       end
 
       def setup_environment(opts)
-        ENV["RACK_ENV"] = ENV["RAILS_ENV"] = ENV["RESQUE_ENV"] = opts[:environment]
-        puts "Running in #{opts[:environment]} environment."
+        ENV["RACK_ENV"] = ENV["RAILS_ENV"] = ENV["RESQUE_ENV"] = opts[:environment] if opts[:environment]
+        puts "Resque Pool running in #{ENV["RAILS_ENV"] || "development"} environment."
         ENV["RESQUE_POOL_CONFIG"] = opts[:config] if opts[:config]
       end
 
       def start_pool
         require 'rake'
         require 'resque/pool/tasks'
+        Rake.application.init
+        Rake.application.load_rakefile
         Rake.application["resque:pool"].invoke
       end
 

data/lib/resque/pool/version.rb

@@ -1,5 +1,5 @@
 module Resque
   class Pool
-    VERSION = "0.0.12.0.alpha"
+    VERSION = "0.0.12.1.alpha"
   end
 end

data/lib/resque/pool.rb

@@ -1,5 +1,6 @@
 # -*- encoding: utf-8 -*-
 require 'resque'
+require 'resque/pool/version'
 require 'resque/pool/logging'
 require 'resque/pool/pooled_worker'
 require 'fcntl'

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: resque-pool
 version: !ruby/object:Gem::Version 
-  hash: -1851332306
+  hash: -1851332310
   prerelease: true
   segments: 
   - 0
   - 0
   - 12
-  - 0
+  - 1
   - alpha
-  version: 0.0.12.0.alpha
+  version: 0.0.12.1.alpha
 platform: ruby
 authors: 
 - nicholas a. evans