canvas-jobs 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32d69dcda463a3ce29b8ff9284868b46c824e3f2
-  data.tar.gz: 9f06f47a35aa855dbc84f5378ba0bb55f0d3a8e4
+  metadata.gz: 06b0d47df9e4e61f3ecb4036f429c02acc0d6cd0
+  data.tar.gz: 81246d65f48fbeac3bd230f0917cf02d0ca702b4
 SHA512:
-  metadata.gz: c85759b2243f6c81285841c6fdf0fe1bddea1fb7ef11d0c33a71870726961ab5a151adb7c807604801d8bc6dc15f209c83248c34522df41f05c6121b35e787a1
-  data.tar.gz: e96532599f39295f4acb34536c506c91770a681597ad3e37a145fd0bed91d14b20fb6e4835c54c40908a425badd069df430ecf9f498c481ae1dbdfa0747bda4b
+  metadata.gz: 995da9b8ba15ab581a67f26b25931ed1faeda4f6a839aaa07a010ab6e7fddd07a1c6fc0f920d39899d3c70990a7208c17e7fb05fdcada38389aa814086d024e1
+  data.tar.gz: 2f809d07cbaf801726610fdb2712807fc8eb762966ec1de580354005ab46d26a0f721821ff25aa6f866bb95fb126be296849b0f856984c2c2b062ecea94ee4c0

data/bin/canvas_job

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+
+require File.expand_path('config/environment')
+Delayed::Pool.new.run()

data/lib/delayed/backend/active_record.rb

@@ -190,7 +190,7 @@ module Delayed
               jobs = jobs.sort_by { rand }
             end
             job = jobs.detect do |job|
-              job.lock_exclusively!(worker_name)
+              job.send(:lock_exclusively!, worker_name)
             end
             return job if job
           end
@@ -259,7 +259,16 @@ module Delayed
         def mark_as_locked!(time, worker)
           self.locked_at    = time
           self.locked_by    = worker
+          # We cheated ActiveRecord::Dirty with the update_all calls above, so
+          # we'll fix things up here.
+          if respond_to?(:changes_applied)
+            changes_applied
+          else
+            changed_attributes['locked_at'] = time
+            changed_attributes['locked_by'] = worker
+          end
         end
+        protected :lock_exclusively!, :mark_as_locked!
 
         def create_and_lock!(worker)
           raise "job already exists" unless new_record?

data/lib/delayed/backend/redis/includes/jobs_common.lua

@@ -140,7 +140,7 @@ local find_available = function(queue, limit, offset, min_priority, max_priority
   end
 
   if not max_priority or max_priority == '' then
-    max_priority = "+inf"
+    max_priority = "(" .. Keys.waiting_strand_job_priority()
   else
     max_priority = "(" .. (max_priority + 1)
   end

data/lib/delayed/backend/redis/job.rb

@@ -87,31 +87,16 @@ class Job
     raise("Delayed::MAX_PRIORITY must be less than #{WAITING_STRAND_JOB_PRIORITY}")
   end
 
-  COLUMNS = [
-    :id,
-    :priority,
-    :attempts,
-    :handler,
-    :last_error,
-    :queue,
-    :run_at,
-    :locked_at,
-    :failed_at,
-    :locked_by,
-    :created_at,
-    :updated_at,
-    :tag,
-    :max_attempts,
-    :strand,
-    :source,
-  ]
+  COLUMNS = []
 
   # We store time attributes in redis as floats so we don't have to do
   # timestamp parsing in lua.
-  TIMESTAMP_COLUMNS = Set.new([:run_at, :locked_at, :failed_at, :created_at, :updated_at])
-  INTEGER_COLUMNS = Set.new([:priority, :attempts, :max_attempts])
+  TIMESTAMP_COLUMNS = []
+  INTEGER_COLUMNS = []
 
   def self.column(name, type)
+    COLUMNS << name
+
     if type == :timestamp
       TIMESTAMP_COLUMNS << name
     elsif type == :integer
@@ -129,9 +114,22 @@ class Job
     EOS
   end
 
-  COLUMNS.each do |c|
-    self.column(c, nil)
-  end
+  column(:id, :string)
+  column(:priority, :integer)
+  column(:attempts, :integer)
+  column(:handler, :string)
+  column(:last_error, :string)
+  column(:queue, :string)
+  column(:run_at, :timestamp)
+  column(:locked_at, :timestamp)
+  column(:failed_at, :timestamp)
+  column(:locked_by, :string)
+  column(:created_at, :timestamp)
+  column(:updated_at, :timestamp)
+  column(:tag, :string)
+  column(:max_attempts, :integer)
+  column(:strand, :string)
+  column(:source, :string)
 
   def initialize(attrs = {})
     attrs.each { |k, v| self.send("#{k}=", v) }
@@ -259,7 +257,7 @@ class Job
       when 'current'
         query ||= Delayed::Settings.queue
         check_queue(query)
-        self.find(functions.find_available(query, limit, offset, nil, nil, db_time_now))
+        self.find(functions.find_available(query, limit, offset, 0, "+inf", db_time_now))
       when 'future'
         query ||= Delayed::Settings.queue
         check_queue(query)
@@ -309,6 +307,7 @@ class Job
       # TODO: mark the job as failed one attempt
       job.unlock! if job.locked_by == worker_name
     end
+    nil
   end
 
   # returns a list of hashes { :tag => tag_name, :count => current_count }

data/lib/delayed/performable_method.rb

@@ -1,7 +1,7 @@
 module Delayed
   class PerformableMethod < Struct.new(:object, :method, :args)
     def initialize(object, method, args = [])
-      raise NoMethodError, "undefined method `#{method}' for #{object.inspect}" unless object.respond_to?(method)
+      raise NoMethodError, "undefined method `#{method}' for #{object.inspect}" unless object.respond_to?(method, true)
 
       self.object = object
       self.args   = args

data/lib/delayed/pool.rb

@@ -215,10 +215,16 @@ class Pool
 
   def tail_rails_log
     return if !@options[:tail_logs]
-    return if !Rails.logger.respond_to?(:log_path)
+    if Rails.logger.respond_to?(:log_path)
+      log_path = Rails.logger.log_path
+    elsif Rails.logger.instance_variable_get('@logdev').try(:instance_variable_get, '@dev').try(:path)
+      log_path = Rails.logger.instance_variable_get('@logdev').instance_variable_get('@dev').path
+    else
+      return
+    end
     Rails.logger.auto_flushing = true if Rails.logger.respond_to?(:auto_flushing=)
     Thread.new do
-      f = File.open(Rails.logger.log_path, 'r')
+      f = File.open(log_path, 'r')
       f.seek(0, IO::SEEK_END)
       loop do
         content = f.read

data/lib/delayed/version.rb

@@ -1,3 +1,3 @@
 module Delayed
-  VERSION = "0.9.5"
+  VERSION = "0.9.6"
 end

data/lib/delayed/worker.rb

@@ -82,7 +82,7 @@ class Worker
     say "Stopping worker", :info
   rescue => e
     Rails.logger.fatal("Child process died: #{e.inspect}") rescue nil
-    self.class.Lifecycle.run_callbacks(:exceptional_exit, self, e) { }
+    self.class.lifecycle.run_callbacks(:exceptional_exit, self, e) { }
   ensure
     Delayed::Job.clear_locks!(name)
   end

data/spec/active_record_job_spec.rb

@@ -32,12 +32,12 @@ describe 'Delayed::Backed::ActiveRecord::Job' do
 
     it "should not allow a second worker to get exclusive access if already successfully processed by worker1" do
       @job.destroy
-      @job_copy_for_worker_2.lock_exclusively!('worker2').should == false
+      @job_copy_for_worker_2.send(:lock_exclusively!, 'worker2').should == false
     end
 
     it "should not allow a second worker to get exclusive access if failed to be processed by worker1 and run_at time is now in future (due to backing off behaviour)" do
       @job.update_attributes(:attempts => 1, :run_at => 1.day.from_now)
-      @job_copy_for_worker_2.lock_exclusively!('worker2').should == false
+      @job_copy_for_worker_2.send(:lock_exclusively!, 'worker2').should == false
     end
 
     it "should select the next job at random if enabled" do
@@ -57,4 +57,14 @@ describe 'Delayed::Backed::ActiveRecord::Job' do
       end
     end
   end
+
+  it "should unlock a successfully locked job and persist the job's unlocked state" do
+    job = Delayed::Job.create :payload_object => SimpleJob.new
+    job.send(:lock_exclusively!, 'worker1').should == true
+    job.unlock
+    job.save!
+    job.reload
+    job.locked_by.should == nil
+    job.locked_at.should == nil
+  end
 end

data/spec/gemfiles/32.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../../
   specs:
-    canvas-jobs (0.9.4)
+    canvas-jobs (0.9.5)
       after_transaction_commit (= 1.0.1)
       rails (>= 3.2)
       redis (> 3.0)

data/spec/gemfiles/40.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../../
   specs:
-    canvas-jobs (0.9.4)
+    canvas-jobs (0.9.5)
       after_transaction_commit (= 1.0.1)
       rails (>= 3.2)
       redis (> 3.0)

data/spec/gemfiles/41.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../../
   specs:
-    canvas-jobs (0.9.4)
+    canvas-jobs (0.9.5)
       after_transaction_commit (= 1.0.1)
       rails (>= 3.2)
       redis (> 3.0)

data/spec/gemfiles/42.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../../
   specs:
-    canvas-jobs (0.9.4)
+    canvas-jobs (0.9.5)
       after_transaction_commit (= 1.0.1)
       rails (>= 3.2)
       redis (> 3.0)

data/spec/shared/shared_backend.rb

@@ -270,6 +270,14 @@ shared_examples_for 'a backend' do
       Delayed::Job.get_and_lock_next_available('w3').should == nil
     end
 
+    it "should not find next jobs when given no priority" do
+      jobs = [create_job(:strand => 'strand1'), create_job(:strand => 'strand1')]
+      first = Delayed::Job.get_and_lock_next_available('w1', Delayed::Settings.queue, nil, nil)
+      second = Delayed::Job.get_and_lock_next_available('w2', Delayed::Settings.queue, nil, nil)
+      expect(first).to eq jobs.first
+      expect(second).to eq nil
+    end
+
     context 'singleton' do
       it "should create if there's no jobs on the strand" do
         @job = create_job(:singleton => 'myjobs')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: canvas-jobs
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors:
 - Tobias Luetke
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-22 00:00:00.000000000 Z
+date: 2014-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: after_transaction_commit
@@ -210,10 +210,12 @@ dependencies:
 description: 
 email:
 - brianp@instructure.com
-executables: []
+executables:
+- canvas_job
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/canvas_job
 - db/migrate/20101216224513_create_delayed_jobs.rb
 - db/migrate/20110208031356_add_delayed_jobs_tag.rb
 - db/migrate/20110426161613_add_delayed_jobs_max_attempts.rb
@@ -298,7 +300,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Instructure-maintained fork of delayed_job
@@ -323,4 +325,3 @@ test_files:
 - spec/shared/worker.rb
 - spec/shared_jobs_specs.rb
 - spec/spec_helper.rb
-has_rdoc: