resque_manager 3.3.0 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2dc1842d613d5bea7b454adf023b49640044354b
-  data.tar.gz: 1a4539c2703f96879d128047b7279332905c7336
+  metadata.gz: dc0f5d6ae5c0b8f07d40fb0255213f896e000b55
+  data.tar.gz: 80b0ec095f8ab9f7f1690528c116f10606c22fed
 SHA512:
-  metadata.gz: 1b8bfb94ace1d479420b8be913c3b4efae77cd0d32b1e0a419fe96b1d15c4c272a162333fdf482bdd920a707ed228e19fb354fbe6aaf3d6ba00059628ffc918e
-  data.tar.gz: c7ca79eadf83075237a5990b2223e4a190ede2abeba24fa6ded8906552fc1afcb44dae2e689554f0bb7dd6884fe102fe48a4c43b37322647b990ed6a940fa283
+  metadata.gz: 2eb3aad6bde5be68c075529a24f69b5220ddafaecfa32c0cf5ce640d37465d74f1770a475a7c8df7b9d49c15d5815a36d5c1314bfdea512baf05eea669366d6a
+  data.tar.gz: d864075ab6c290d213ba0ffe6bcd3b71d29822f80e2502067b8c709b5e2851b69a15f5fdfb042599f3956aae0fafd9dabf63d7c864e47fc1535560a2f54d35f4

data/README.markdown

@@ -153,7 +153,7 @@ Resque::Plugins::Status, and everything after that includes from Resque::Plugins
 the chained job from the preceding job, you just need to pass {'uuid' => uuid} as one of the hash arguments.
 
     class DataContributionFile
-        Resque::Plugins::Status
+        include Resque::Plugins::Status
 
         @queue = :data_contribution
 
@@ -167,7 +167,7 @@ the chained job from the preceding job, you just need to pass {'uuid' => uuid} a
     end
 
     class SingleRecordLoader
-        Resque::Plugins::ChainedStatus
+        include Resque::Plugins::ChainedStatus
         @queue = :single_record_loader
 
         def completed(*messages)

data/app/controllers/resque_manager/resque_controller.rb

@@ -42,42 +42,42 @@ class ResqueManager::ResqueController < ApplicationController
     # in the application the UI is in.
     if ResqueManager.applications.blank?
       Resque.dequeue(params['class'].constantize, *Resque.decode(params['args']))
-      redirect_to request.referrer
     end
+    redirect_to request.referrer
   end
 
   def stop_worker
     worker = find_worker(params[:worker])
     worker.quit if worker
-    redirect_to(:action => "workers")
+    redirect_to workers_resque_path
   end
 
   def pause_worker
     worker = find_worker(params[:worker])
     worker.pause if worker
-    redirect_to(:action => "workers")
+    redirect_to workers_resque_path
   end
 
   def continue_worker
     worker = find_worker(params[:worker])
     worker.continue if worker
-    redirect_to(:action => "workers")
+    redirect_to workers_resque_path
   end
 
   def restart_worker
     worker = find_worker(params[:worker])
     worker.restart if worker
-    redirect_to(:action => "workers")
+    redirect_to workers_resque_path
   end
 
   def start_worker
     Resque::Worker.start(params)
-    redirect_to(:action => "workers")
+    redirect_to workers_resque_path
   end
 
   def stats
     unless params[:id]
-      redirect_to(:action => 'stats', :id => 'resque')
+      redirect_to(stats_resque_path(:id => 'resque'))
     end
 
     if params[:id] == 'txt'
@@ -89,7 +89,6 @@ class ResqueManager::ResqueController < ApplicationController
       stats << "resque.failed+=#{info[:failed]}"
       stats << "resque.workers=#{info[:workers]}"
       stats << "resque.working=#{info[:working]}"
-
       Resque.queues.each do |queue|
         stats << "queues.#{queue}=#{Resque.size(queue)}"
       end
@@ -107,13 +106,13 @@ class ResqueManager::ResqueController < ApplicationController
   def schedule_requeue
     config = Resque.schedule[params['job_name']]
     Resque::Scheduler.enqueue_from_config(config)
-    redirect_to(:action => 'overview')
+    redirect_to overview_resque_path
   end
 
   def add_scheduled_job
     errors = []
     if Resque.schedule.keys.include?(params[:name])
-      errors << 'Name already exists'
+      errors << 'Name already exists.'
     end
     if params[:ip].blank?
       errors << 'You must enter an ip address for the server you want this job to run on.'
@@ -129,33 +128,32 @@ class ResqueManager::ResqueController < ApplicationController
                                    'description' => params['description']}
       }
       Resque.redis.rpush(:scheduled, Resque.encode(config))
-      ResqueScheduler.restart('ip')
+      ResqueScheduler.restart(params['ip'])
     else
-      flash[:error] = errors.join('<br>')
+      flash[:error] = errors.join('<br>').html_safe
     end
-    redirect_to(:action => 'schedule')
+    redirect_to schedule_resque_path
   end
 
   def remove_from_schedule
     Resque.list_range(:scheduled, 0, -0).each do |s|
-
       if s[params['job_name']]
         Resque.redis.lrem(:scheduled, 0, s.to_json)
         # Restart the scheduler on the server that has changed it's schedule
         ResqueScheduler.restart(params['ip'])
       end
     end
-    redirect_to(:action => 'schedule')
+    redirect_to schedule_resque_path
   end
 
   def start_scheduler
     ResqueScheduler.start(params[:ip])
-    redirect_to(:action => 'schedule')
+    redirect_to schedule_resque_path
   end
 
   def stop_scheduler
     ResqueScheduler.quit(params[:ip])
-    redirect_to(:action => 'schedule')
+    redirect_to schedule_resque_path
   end
 
   # resque-status actions
@@ -165,20 +163,22 @@ class ResqueManager::ResqueController < ApplicationController
     @end = @start + (params[:per_page] || 20)
     @statuses = Resque::Plugins::Status::Hash.statuses(@start, @end)
     @size = Resque::Plugins::Status::Hash.status_ids.size
-    if params[:format] == 'js'
-      render :text => @statuses.to_json
+    respond_to do |format|
+      format.js   { render json: @statuses }
+      format.json { render json: @statuses }
     end
   end
 
   def clear_statuses
     Resque::Plugins::Status::Hash.clear
-    redirect_to(:action => 'statuses')
+    redirect_to statuses_resque_path
   end
 
   def status
     @status = Resque::Plugins::Status::Hash.get(params[:id])
-    if params[:format] == 'js'
-      render :text => @status.to_json
+    respond_to do |format|
+      format.js   { render json: @status }
+      format.json { render json: @status }
     end
   end
 
@@ -187,7 +187,7 @@ class ResqueManager::ResqueController < ApplicationController
     s = Resque::Plugins::Status::Hash.get(params[:id])
     s.status = 'killed'
     Resque::Plugins::Status::Hash.set(params[:id], s)
-    redirect_to(:action => 'statuses')
+    redirect_to statuses_resque_path
   end
 
   def cleaner
@@ -262,7 +262,7 @@ class ResqueManager::ResqueController < ApplicationController
 
   def cleaner_stale
     @cleaner.clear_stale
-    redirect_to :action => "cleaner"
+    redirect_to cleaner_resque_path
   end
 
 
@@ -271,11 +271,12 @@ class ResqueManager::ResqueController < ApplicationController
   def check_connection
     Resque.keys
   rescue Errno::ECONNREFUSED
-    render(:template => 'resque/error', :layout => false, :locals => {:error => "Can't connect to Redis! (#{Resque.redis.server})"})
+    render(:template => 'resque_manager/resque/error', :layout => false, :locals => { :error => "Can't connect to Redis! (#{Resque.redis_id})" })
     false
   end
 
   def find_worker(worker)
+    return nil if worker.blank?
     first_part, *rest = worker.split(':')
     first_part.gsub!(/_/, '.')
     Resque::Worker.find("#{first_part}:#{rest.join(':')}")
@@ -290,14 +291,14 @@ class ResqueManager::ResqueController < ApplicationController
   end
 
   def load_cleaner_filter
-    @from = params[:f]=="" ? nil : params[:f]
-    @to = params[:t]=="" ? nil : params[:t]
-    @klass = params[:c]=="" ? nil : params[:c]
-    @exception = params[:ex]=="" ? nil : params[:ex]
+    @from      = params[:f].blank?  ? nil : params[:f]
+    @to        = params[:t].blank?  ? nil : params[:t]
+    @klass     = params[:c].blank?  ? nil : params[:c]
+    @exception = params[:ex].blank? ? nil : params[:ex]
   end
 
   def filter_block
-    block = lambda { |j|
+    lambda { |j|
       (!@from || j.after?(hours_ago(@from))) &&
           (!@to || j.before?(hours_ago(@to))) &&
           (!@klass || j.klass?(@klass)) &&
@@ -309,5 +310,4 @@ class ResqueManager::ResqueController < ApplicationController
   def hours_ago(h)
     Time.now - h.to_i*60*60
   end
-
 end

data/app/helpers/resque_manager/resque_helper.rb

@@ -91,7 +91,7 @@ module ResqueManager
       if @polling
         text = "Last Updated: #{Time.now.strftime("%H:%M:%S")}"
       else
-        text = link_to('Live Poll', {:action => 'status_poll', :start => start}, :rel => 'poll')
+        text = link_to('Live Poll', status_poll_resque_path({:start => start}), :rel => 'poll')
       end
       "<p class='poll'>#{text}</p>".html_safe
     end

data/app/views/resque_manager/resque/_queues.html.erb

@@ -51,7 +51,7 @@
           </tr>
       <% end %>
       <tr class='failed'>
-        <td class='queue failed'><%= link_to('failed', {:action => "cleaner"}, :class => 'queue') %></td>
+        <td class='queue failed'><%= link_to('failed', cleaner_resque_path , :class => 'queue') %></td>
         <td class='size'><%= Resque::Failure.count %></td>
       </tr>
     </table>

data/app/views/resque_manager/resque/schedule.html.erb

@@ -21,7 +21,7 @@
     <% Resque.schedule.each do |name,config| %>
       <tr>
         <td>
-          <%= button_to "Queue now", {:controller=>'resque', :action=> 'schedule_requeue', :job_name => name}, :method => :post %>
+          <%= button_to "Queue now", schedule_requeue_resque_path(job_name: name), :method => :post %>
         </td>
         <td><%= h name %></td>
         <td><%= h config['ip'] %></td>
@@ -29,7 +29,7 @@
         <td style="white-space:nowrap"><%= h config['cron'] %></td>
         <td><%= h config['class'] %></td>
         <td><%= h config['args'].inspect %></td>
-        <td><%= button_to "Remove", {:controller=>'resque', :action=> 'remove_from_schedule', :job_name => name, :ip => config['ip']}, :method => :post %></td>
+        <td><%= button_to "Remove", remove_from_schedule_resque_path(job_name: name, ip: config['ip']), :method => :post %></td>
       </tr>
     <%end%>
   </table>
@@ -38,10 +38,8 @@
   <div id='flash' class="flash">
     <%flash_message = flash_helper%>
     <% unless flash_message.blank? -%>
-      <p>
-        <%= flash_message %>
-      </p>
-      <%= javascript_tag "$('flash').show();" %>
+        <%= flash_message.html_safe %>
+        <%= javascript_tag "$('flash').show();" %>
     <% end %>
   </div>
   <%= form_tag '/resque/add_scheduled_job' do -%>
@@ -85,9 +83,9 @@
         <td><%= status %></td>
         <td>
           <%  if status == 'Running' -%>
-            <%= button_to "Stop Scheduler", {:controller=>'resque', :action=> 'stop_scheduler', :ip => ip}, :method => :post %>
+            <%= button_to 'Stop Scheduler', stop_scheduler_resque_path(ip: ip), :method => :post %>
           <% else -%>
-            <%= button_to "Start Scheduler", {:controller=>'resque', :action=> 'start_scheduler', :ip => ip}, :method => :post %>
+            <%= button_to 'Start Scheduler', stop_scheduler_resque_path(ip: ip), :method => :post %>
           <% end -%>
         </td>
       </tr>

data/lib/resque_manager.rb

@@ -1,15 +1,15 @@
-require "resque_manager/engine"
+require 'resque_manager/engine'
 require 'resque/server'
 require 'resque_manager/overrides/resque/worker'
 require 'resque_manager/overrides/resque/resque'
 require 'resque_manager/overrides/resque/job'
 require 'resque_manager/overrides/resque/failure/redis'
 if Resque.respond_to? :schedule
-  require 'resque_scheduler/tasks'
   require 'resque_manager/overrides/resque_scheduler/resque_scheduler'
 end
 require 'resque-status'
 require 'resque_manager/overrides/resque_status/status'
+require 'resque_manager/overrides/resque_status/hash'
 require 'resque_manager/overrides/resque_status/chained_status'
 require 'resque-cleaner'
 

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

@@ -5,12 +5,7 @@ module Resque
     @@local_ip = nil
 
     def local_ip
-      @@local_ip ||= begin
-        UDPSocket.open do |s|
-          s.connect 'google.com', 1
-          s.addr.last
-        end
-      end
+      @@local_ip ||= IPSocket.getaddress(Socket.gethostname)
     end
 
     # The string representation is the same as the id for this worker
@@ -40,7 +35,7 @@ module Resque
     end
 
     def queue
-      to_s.split(':').last
+      to_s.split(':').fifth
     end
 
     def workers_in_pid
@@ -52,7 +47,7 @@ module Resque
     end
 
     def queues_in_pid
-      workers_in_pid.collect { |w| w.queue }
+      workers_in_pid.collect { |w| w.queue }.compact
     end
 
     #OVERRIDE for multithreaded workers
@@ -100,7 +95,7 @@ module Resque
     #OVERRIDE to set a redis key so UI knows it's paused too
     # Would prefer to call super but get no superclass method error
     def pause_processing
-      log "USR2 received; pausing job processing"
+      log 'USR2 received; pausing job processing'
       @paused = true
       Resque.redis.set(pause_key, Time.now.to_s)
     end
@@ -109,7 +104,7 @@ module Resque
     #OVERRIDE to set remove redis key so UI knows it's unpaused too
     # Would prefer to call super but get no superclass method error
     def unpause_processing
-      log "CONT received; resuming job processing"
+      log 'CONT received; resuming job processing'
       @paused = false
       Resque.redis.del(pause_key)
     end
@@ -167,12 +162,11 @@ module Resque
     #OVERRIDE for multithreaded workers
     def work(interval = 5.0, &block)
       interval = Float(interval)
-      $0 = "resque: Starting"
+      $0 = 'resque: Starting'
       startup
 
       loop do
         break if shutdown? || Thread.current[:shutdown]
-
         if not paused? and job = reserve
           log "got: #{job.inspect}"
           job.worker = self

data/lib/resque_manager/overrides/resque_scheduler/resque_scheduler.rb

@@ -16,7 +16,7 @@ module ResqueScheduler
 
   def self.start(ips)
     if Rails.env =~ /development|test/
-      Thread.new{system("rake resque:scheduler")}
+      Thread.new{system('rake resque:scheduler')}
     else
       Thread.new(ips){|ip_list|system("cd #{Rails.root}; #{ResqueManager::Cap.path} #{Rails.env} resque:scheduler host=#{ip_list}")}
     end
@@ -24,9 +24,9 @@ module ResqueScheduler
 
   def self.quit(ips)
     if Rails.env =~ /development|test/
-      system("rake resque:quit_scheduler")
+      system('rake resque:quit_scheduler')
     else
-      system("cd #{Rails.root}; #{ResqueManager::Cap.path} #{Rails.env} resque:quit_scheduler host=#{ips}")
+      system("cd #{Rails.root}; bundle exec cap #{Rails.env} resque:quit_scheduler host=#{ips}")
     end
   end
 
@@ -41,7 +41,7 @@ module ResqueScheduler
       status['localhost'] = pids.present? ? 'Running' : 'Stopped'
     else
       Resque.schedule.values.collect{|job| job['ip']}.each do |ip|
-        cap = `cd #{Rails.root}; #{ResqueManager::Cap.path} #{Rails.env} resque:scheduler_status hosts=#{ip}`
+        cap = `cd #{Rails.root}; bundle exec cap #{Rails.env} resque:scheduler_status hosts=#{ip}`
         status[ip] = cap =~ /resque:scheduler is up/ ? 'Running' : 'Stopped'
       end
     end

data/lib/resque_manager/overrides/resque_status/status.rb

@@ -45,7 +45,7 @@ module Resque
 
         # OVERRIDE to clear all the keys that have the UUI. status, counters, etc.
         def remove(uuid)
-          Resque.redis.zrem(set_key, uuid)
+          Resque.redis.zrem(Resque::Plugins::Status::Hash.set_key, uuid)
           Resque.redis.keys("*#{uuid}").each do |key|
             Resque.redis.del(key)
           end
@@ -130,7 +130,7 @@ module Resque
         Rails.logger.info "Job #{self} Killed at #{Time.now}"
         Resque::Plugins::Status::Hash.killed(uuid)
         on_killed if respond_to?(:on_killed)
-      rescue => e
+      rescue Exception => e
         Rails.logger.error e
         failed("The task failed because of an error: #{e}")
         if respond_to?(:on_failure)

data/lib/resque_manager/version.rb

@@ -1,3 +1,3 @@
 module ResqueManager
-  VERSION = "3.3.0"
+  VERSION = "3.3.1"
 end

data/lib/tasks/scheduler.rake

@@ -1,6 +1,6 @@
 namespace :resque do
 
-  desc "Kill the scheduler pid"
+  desc 'Kill the scheduler pid'
   task :quit_scheduler => :setup do
     require 'resque_scheduler'
     ResqueScheduler.pids.each do |pid|
@@ -8,4 +8,4 @@ namespace :resque do
     end
   end
 
-end
+end if Resque.respond_to? :schedule

data/test/dummy/app/models/data_contribution_file.rb

@@ -0,0 +1,28 @@
+class DataContributionFile
+  include Resque::Plugins::Status
+  @queue = :data_contribution
+
+  def perform
+    #stub
+  end
+
+  def on_failure(e)
+    #stub
+  end
+
+  def on_success
+    #stub
+  end
+
+  def completed?
+    #stub
+  end
+
+  def failed?
+    #stub
+  end
+
+  def killed?
+    #stub
+  end
+end