resque_ui 3.1.0 → 3.1.1

data/History.txt

@@ -1,3 +1,10 @@
+== 3.1.1 2011-10-13
+
+*  Modified the restart_workers and quit_workers cap tasks to no longer use the , :only => {:resque_restart => true} flag.
+    -   These tasks now execute the rake tasks on all servers in the farm
+*  Modified the restart_workers and quit_workers rake tasks to not execute separate cap tasks for each worker.
+    -   Task now iterates through the workers and restarts the ones on the box the rake task is executing on.
+
 == 3.1.0 2011-09-22
 
 *  Added Resque Cleaner to manage the failed queue.  Removed the Failed tab.

data/README.markdown

@@ -182,10 +182,13 @@ You will also need to tell resque_ui where cap is installed.  Add this line to y
 
 The cap tasks included are:
 
-    cap resque:work          # start a resque worker.
-    cap resque:workers       # start multiple resque workers.
-    cap resque:quit_worker   # Gracefully kill a worker.  If the worker is working, it will finish before shutting down.
-    cap resque:restart_workers # Restart all workers on all servers
+    cap resque:work                         # start a resque worker.
+    cap resque:workers                      # start multiple resque workers.
+    cap resque:quit_worker                  # Gracefully kill a worker.  If the worker is working, it will finish before shutting down.
+    cap resque:quit_workers                 # Gracefully kill all workers on all servers.  If the worker is working, it will finish before shutting down.
+    cap resque:kill_worker_with_impunity    # Kill a rogue worker.  If the worker is working, it will not finish and the job will go to the Failed queue as a DirtyExit. arg: host=ip pid=pid
+    cap resque:kill_workera_with_impunity   # Kill all rogue workers on all servers.  If the worker is working, it will not finish and the job will go to the Failed queue as a DirtyExit.
+    cap resque:restart_workers              # Restart all workers on all servers
 
 Multi-Threaded Workers
 ---------------------
@@ -211,13 +214,7 @@ After Deploy Hooks
 The resque:restart_workers cap task can be added as an after deploy task to refresh your workers.  Without this, your workers will
 continue to run your old code base after a deployment.
 
-To make it work:
-Set one of the servers in your app role as the resque_restart server:
-
-    role :app, "your.first.ip.1","your.second.ip"
-    role :app,  "your.first.ip.1", :resque_restart => true
-
-Then add the callbacks:
+To make it work add the callbacks in your deploy.rb file:
 
     after "deploy", "resque:restart_workers"
     after "deploy:migrations", "resque:restart_workers"

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 3
 :minor: 1
-:patch: 0
+:patch: 1
 :build: 

data/lib/resque_ui/cap_recipes.rb

@@ -28,13 +28,13 @@ Capistrano::Configuration.instance(:must_exist).load do
     end
 
     desc "Gracefully kill all workers on all servers.  If the worker is working, it will finish before shutting down."
-    task :quit_workers, :roles => :app, :only => {:resque_restart => true} do
+    task :quit_workers, :roles => :app do
       default_run_options[:pty] = true
       rake                      = fetch(:rake, "rake")
       run("cd #{current_path}; #{rake} RAILS_ENV=#{stage} resque:quit_workers")
     end
 
-    desc "Kill a rogue worker.  If the worker is working, it will not finish and the job will go to the Failed queue as a DirtExit. arg: host=ip pid=pid"
+    desc "Kill a rogue worker.  If the worker is working, it will not finish and the job will go to the Failed queue as a DirtyExit. arg: host=ip pid=pid"
     task :kill_worker_with_impunity, :roles => :app do
       if ENV['host'].nil? || ENV['host'].empty? || ENV['pid'].nil? || ENV['pid'].empty?
         puts 'You must enter the host and pid to kill..cap resque:quit host=ip pid=pid'
@@ -44,7 +44,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       end
     end
 
-    desc "Kill all rogue workers on all servers.  If the worker is working, it will not finish and the job will go to the Failed queue as a DirtExit. arg: host=ip pid=pid"
+    desc "Kill all rogue workers on all servers.  If the worker is working, it will not finish and the job will go to the Failed queue as a DirtyExit.
     task :kill_workers_with_impunity, :roles => :app do
       default_run_options[:pty] = true
       rake                      = fetch(:rake, "rake")
@@ -62,7 +62,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     end
 
     desc "Restart all workers on all servers"
-    task :restart_workers, :roles => :app, :only => {:resque_restart => true} do
+    task :restart_workers, :roles => :app do
       default_run_options[:pty] = true
       rake                      = fetch(:rake, "rake")
       run("cd #{current_path}; nohup #{rake} RAILS_ENV=#{stage} resque:restart_workers")

data/lib/resque_ui/overrides/resque/worker.rb

@@ -206,7 +206,7 @@ module Resque
 
     def self.start(ips, queues)
       if Rails.env =~ /development|test/
-        Thread.new(queues) { |queue| system("rake QUEUE=#{queue} resque:work") }
+        Thread.new(queues) { |queue| system("rake RAILS_ENV=#{Rails.env} QUEUE=#{queue} resque:work") }
       else
         Thread.new(queues, ips) { |queue, ip_list| system("cd #{Rails.root}; #{ResqueUi::Cap.path} #{Rails.env} resque:work host=#{ip_list} queue=#{queue}") }
       end

data/lib/resque_ui.rb

@@ -18,10 +18,5 @@ Resque::Server.tabs.delete 'Failed'
 
 module ResqueUi
   class Engine < Rails::Engine
-    rake_tasks do
-      load 'tasks/worker.rake'
-      load 'tasks/failure.rake'
-      load 'tasks/scheduler.rake' if Resque.respond_to? :schedule
-    end
   end
 end

data/lib/tasks/worker.rake

@@ -4,14 +4,14 @@ namespace :resque do
   task :work => :setup do
     require 'resque'
 
-    worker                  = nil
-    queues                  = (ENV['QUEUES'] || ENV['QUEUE']).to_s.split('#').delete_if { |a| a.blank? }
-    threads                 = []
-    mqueue                  = queues.shift
+    worker = nil
+    queues = (ENV['QUEUES'] || ENV['QUEUE']).to_s.split('#').delete_if { |a| a.blank? }
+    threads = []
+    mqueue = queues.shift
     Thread.current[:queues] = mqueue
-    mworker                 = Resque::Worker.new(mqueue)
-    mworker.verbose         = true #ENV['LOGGING'] || ENV['VERBOSE']
-    mworker.very_verbose    = true #ENV['VVERBOSE']
+    mworker = Resque::Worker.new(mqueue)
+    mworker.verbose = true #ENV['LOGGING'] || ENV['VERBOSE']
+    mworker.very_verbose = true #ENV['VVERBOSE']
 
     if ENV['PIDFILE']
       File.open(ENV['PIDFILE'], 'w') { |f| f << mworker.pid }
@@ -21,9 +21,9 @@ namespace :resque do
       threads << Thread.new do
         begin
           Thread.current[:queues] = queue
-          worker                  = Resque::Worker.new(queue)
-          worker.verbose          = ENV['LOGGING'] || ENV['VERBOSE']
-          worker.very_verbose     = ENV['VVERBOSE']
+          worker = Resque::Worker.new(queue)
+          worker.verbose = ENV['LOGGING'] || ENV['VERBOSE']
+          worker.very_verbose = ENV['VVERBOSE']
         rescue Resque::NoQueueError
           abort "set QUEUE env var, e.g. $ QUEUE=critical,high rake resque:work"
         end
@@ -45,10 +45,16 @@ namespace :resque do
   task :restart_workers => :setup do
     require 'resque'
     pid = ''
+    queues = ''
+    local_ip = Resque.workers.first.local_ip rescue '';
     Resque.workers.sort_by { |w| w.to_s }.each do |worker|
-      if pid != worker.pid
-        worker.restart
-        pid = worker.pid
+      if local_ip == worker.ip # only restart the workers that are on this server
+        if pid != worker.pid
+          system("kill -INT  #{worker.pid}")
+          queues = worker.queues_in_pid.join('#')
+          Thread.new(queues) { |queue| system("nohup rake RAILS_ENV=#{Rails.env} QUEUE=#{queue} resque:work") }
+          pid = worker.pid
+        end
       end
     end
   end
@@ -57,10 +63,13 @@ namespace :resque do
   task :quit_workers => :setup do
     require 'resque'
     pid = ''
+    local_ip = Resque.workers.first.local_ip
     Resque.workers.sort_by { |w| w.to_s }.each do |worker|
-      if pid != worker.pid
-        worker.quit
-        pid = worker.pid
+      if local_ip == worker.ip # only quit the workers that are on this server
+        if pid != worker.pid
+          system("kill -INT  #{worker.pid}")
+          pid = worker.pid
+        end
       end
     end
   end
@@ -69,10 +78,13 @@ namespace :resque do
   task :kill_workers_with_impunity => :setup do
     require 'resque'
     pid = ''
+    local_ip = Resque.workers.first.local_ip
     Resque.workers.sort_by { |w| w.to_s }.each do |worker|
-      if pid != worker.pid
-        `kill -9 #{worker.pid}`
-        pid = worker.pid
+      if local_ip == worker.ip # only kill the pids that are on this server
+        if pid != worker.pid # only kill it once
+          `kill -9 #{worker.pid}`
+          pid = worker.pid
+        end
       end
     end
   end

data/rdoc/Resque/Worker.html

@@ -212,7 +212,7 @@
 <span class="ruby-comment"># File lib/resque_ui/overrides/resque/worker.rb, line 207</span>
 <span class="ruby-keyword">def</span> <span class="ruby-keyword">self</span>.<span class="ruby-identifier">start</span>(<span class="ruby-identifier">ips</span>, <span class="ruby-identifier">queues</span>)
   <span class="ruby-keyword">if</span> <span class="ruby-constant">Rails</span>.<span class="ruby-identifier">env</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp">/development|test/</span>
-    <span class="ruby-constant">Thread</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">queues</span>) { <span class="ruby-operator">|</span><span class="ruby-identifier">queue</span><span class="ruby-operator">|</span> <span class="ruby-identifier">system</span>(<span class="ruby-node">&quot;rake QUEUE=#{queue} resque:work&quot;</span>) }
+    <span class="ruby-constant">Thread</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">queues</span>) { <span class="ruby-operator">|</span><span class="ruby-identifier">queue</span><span class="ruby-operator">|</span> <span class="ruby-identifier">system</span>(<span class="ruby-node">&quot;rake RAILS_ENV=#{Rails.env} QUEUE=#{queue} resque:work&quot;</span>) }
   <span class="ruby-keyword">else</span>
     <span class="ruby-constant">Thread</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">queues</span>, <span class="ruby-identifier">ips</span>) { <span class="ruby-operator">|</span><span class="ruby-identifier">queue</span>, <span class="ruby-identifier">ip_list</span><span class="ruby-operator">|</span> <span class="ruby-identifier">system</span>(<span class="ruby-node">&quot;cd #{Rails.root}; #{ResqueUi::Cap.path} #{Rails.env} resque:work host=#{ip_list} queue=#{queue}&quot;</span>) }
   <span class="ruby-keyword">end</span>

data/rdoc/created.rid

@@ -1,11 +1,11 @@
-Thu, 22 Sep 2011 15:32:04 -0400
-README.markdown	Thu, 22 Sep 2011 15:30:29 -0400
-lib/resque_ui.rb	Thu, 22 Sep 2011 14:44:55 -0400
+Thu, 13 Oct 2011 12:25:22 -0400
+README.markdown	Thu, 13 Oct 2011 12:23:16 -0400
+lib/resque_ui.rb	Thu, 13 Oct 2011 11:42:34 -0400
 lib/resque_ui/cap.rb	Wed, 14 Sep 2011 16:39:33 -0400
-lib/resque_ui/cap_recipes.rb	Wed, 27 Apr 2011 11:46:56 -0400
+lib/resque_ui/cap_recipes.rb	Thu, 13 Oct 2011 12:23:16 -0400
 lib/resque_ui/overrides/resque/job.rb	Fri, 16 Sep 2011 14:33:15 -0400
 lib/resque_ui/overrides/resque/resque.rb	Thu, 15 Sep 2011 12:15:57 -0400
-lib/resque_ui/overrides/resque/worker.rb	Thu, 15 Sep 2011 12:15:57 -0400
+lib/resque_ui/overrides/resque/worker.rb	Tue, 11 Oct 2011 14:29:01 -0400
 lib/resque_ui/overrides/resque_scheduler/resque_scheduler.rb	Thu, 15 Sep 2011 11:57:02 -0400
 lib/resque_ui/overrides/resque_status/chained_job_with_status.rb	Thu, 15 Sep 2011 12:06:19 -0400
 lib/resque_ui/overrides/resque_status/job_with_status.rb	Thu, 15 Sep 2011 12:06:45 -0400

data/rdoc/index.html

@@ -6,7 +6,7 @@
 <head>
   <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
 
-  <title>ResqueUi 3.1.0</title>
+  <title>ResqueUi 3.1.1</title>
 
   <link type="text/css" media="screen" href="rdoc.css" rel="stylesheet" />
 
@@ -19,10 +19,10 @@
 <body class="indexpage">
 
   
-  <h1>ResqueUi 3.1.0</h1>
+  <h1>ResqueUi 3.1.1</h1>
 
   
-  <p>This is the API documentation for 'ResqueUi 3.1.0'.</p>
+  <p>This is the API documentation for 'ResqueUi 3.1.1'.</p>
   
 
   

data/rdoc/lib/resque_ui/cap_rb.html

@@ -6,7 +6,7 @@
 <head>
   <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
 
-  <title>File: cap.rb [ResqueUi 3.1.0]</title>
+  <title>File: cap.rb [ResqueUi 3.1.1]</title>
 
   <link type="text/css" media="screen" href="../../rdoc.css" rel="stylesheet" />
 

data/rdoc/lib/resque_ui/cap_recipes_rb.html

@@ -6,7 +6,7 @@
 <head>
   <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
 
-  <title>File: cap_recipes.rb [ResqueUi 3.1.0]</title>
+  <title>File: cap_recipes.rb [ResqueUi 3.1.1]</title>
 
   <link type="text/css" media="screen" href="../../rdoc.css" rel="stylesheet" />
 
@@ -24,7 +24,7 @@
   <div id="metadata">
     <dl>
       <dt class="modified-date">Last Modified</dt>
-      <dd class="modified-date">Wed Apr 27 11:46:56 -0400 2011</dd>
+      <dd class="modified-date">Thu Oct 13 12:23:16 -0400 2011</dd>
 
       
       <dt class="requires">Requires</dt>

data/rdoc/lib/resque_ui/overrides/resque/job_rb.html

@@ -6,7 +6,7 @@
 <head>
   <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
 
-  <title>File: job.rb [ResqueUi 3.1.0]</title>
+  <title>File: job.rb [ResqueUi 3.1.1]</title>
 
   <link type="text/css" media="screen" href="../../../../rdoc.css" rel="stylesheet" />
 

data/rdoc/lib/resque_ui/overrides/resque/resque_rb.html

@@ -6,7 +6,7 @@
 <head>
   <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
 
-  <title>File: resque.rb [ResqueUi 3.1.0]</title>
+  <title>File: resque.rb [ResqueUi 3.1.1]</title>
 
   <link type="text/css" media="screen" href="../../../../rdoc.css" rel="stylesheet" />
 

data/rdoc/lib/resque_ui/overrides/resque/worker_rb.html

@@ -6,7 +6,7 @@
 <head>
   <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
 
-  <title>File: worker.rb [ResqueUi 3.1.0]</title>
+  <title>File: worker.rb [ResqueUi 3.1.1]</title>
 
   <link type="text/css" media="screen" href="../../../../rdoc.css" rel="stylesheet" />
 
@@ -24,7 +24,7 @@
   <div id="metadata">
     <dl>
       <dt class="modified-date">Last Modified</dt>
-      <dd class="modified-date">Thu Sep 15 12:15:57 -0400 2011</dd>
+      <dd class="modified-date">Tue Oct 11 14:29:01 -0400 2011</dd>
 
       
       <dt class="requires">Requires</dt>

data/rdoc/lib/resque_ui/overrides/resque_scheduler/resque_scheduler_rb.html

@@ -6,7 +6,7 @@
 <head>
   <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
 
-  <title>File: resque_scheduler.rb [ResqueUi 3.1.0]</title>
+  <title>File: resque_scheduler.rb [ResqueUi 3.1.1]</title>
 
   <link type="text/css" media="screen" href="../../../../rdoc.css" rel="stylesheet" />
 

data/rdoc/lib/resque_ui/overrides/resque_status/chained_job_with_status_rb.html

@@ -6,7 +6,7 @@
 <head>
   <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
 
-  <title>File: chained_job_with_status.rb [ResqueUi 3.1.0]</title>
+  <title>File: chained_job_with_status.rb [ResqueUi 3.1.1]</title>
 
   <link type="text/css" media="screen" href="../../../../rdoc.css" rel="stylesheet" />
 

data/rdoc/lib/resque_ui/overrides/resque_status/job_with_status_rb.html

@@ -6,7 +6,7 @@
 <head>
   <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
 
-  <title>File: job_with_status.rb [ResqueUi 3.1.0]</title>
+  <title>File: job_with_status.rb [ResqueUi 3.1.1]</title>
 
   <link type="text/css" media="screen" href="../../../../rdoc.css" rel="stylesheet" />
 

data/rdoc/lib/resque_ui/overrides/resque_status/status_rb.html

@@ -6,7 +6,7 @@
 <head>
   <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
 
-  <title>File: status.rb [ResqueUi 3.1.0]</title>
+  <title>File: status.rb [ResqueUi 3.1.1]</title>
 
   <link type="text/css" media="screen" href="../../../../rdoc.css" rel="stylesheet" />
 

data/rdoc/lib/resque_ui_rb.html

@@ -6,7 +6,7 @@
 <head>
   <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
 
-  <title>File: resque_ui.rb [ResqueUi 3.1.0]</title>
+  <title>File: resque_ui.rb [ResqueUi 3.1.1]</title>
 
   <link type="text/css" media="screen" href="../rdoc.css" rel="stylesheet" />
 
@@ -24,7 +24,7 @@
   <div id="metadata">
     <dl>
       <dt class="modified-date">Last Modified</dt>
-      <dd class="modified-date">Thu Sep 22 14:44:55 -0400 2011</dd>
+      <dd class="modified-date">Thu Oct 13 11:42:34 -0400 2011</dd>
 
       
       <dt class="requires">Requires</dt>

data/resque_ui.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{resque_ui}
-  s.version = "3.1.0"
+  s.version = "3.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kevin Tyll"]
-  s.date = %q{2011-09-22}
+  s.date = %q{2011-10-13}
   s.description = %q{A Rails UI for Resque for managing workers, failures and schedules.}
   s.email = %q{kevintyll@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -2,7 +2,7 @@
 name: resque_ui
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors: 
   - Kevin Tyll
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-22 00:00:00 -04:00
+date: 2011-10-13 00:00:00 -04:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency