Download as
Browse Code »

Commit 52344de211b27da9b4ea257424efe3ca684a7ad9

Authored by Luke Baker
1 parent 6be79b68
Exists in master and in 1 other branch production-vendorized

upgrade delayed_job and modify db schema for delayed_job

Showing 4 changed files with 19 additions and 5 deletions   Show diff stats
config/environment.rb
  Diff comments   View file @52344de
@@ -51,7 +51,7 @@ Rails::Initializer.run do |config| @@ -51,7 +51,7 @@ Rails::Initializer.run do |config|
51 :lib => 'fastercsv', 51 :lib => 'fastercsv',
52 :version => '1.5.1' 52 :version => '1.5.1'
53 config.gem 'delayed_job', 53 config.gem 'delayed_job',
54 - :version => '2.0.3' 54 + :version => '2.0.6'
55 config.gem 'redis', 55 config.gem 'redis',
56 :version => '1.0.7' 56 :version => '1.0.7'
57 config.gem 'newrelic_rpm', 57 config.gem 'newrelic_rpm',
config/initializers/delayed_job.rb
  Diff comments   View file @52344de
1 Delayed::Worker.backend = :active_record 1 Delayed::Worker.backend = :active_record
2 Delayed::Worker.destroy_failed_jobs = false 2 Delayed::Worker.destroy_failed_jobs = false
3 Delayed::Worker.sleep_delay = 5 3 Delayed::Worker.sleep_delay = 5
4 -Delayed::Worker.max_attempts = 3  
5 -Delayed::Worker.max_run_time = 10.minutes 4 +Delayed::Worker.max_attempts = 5
  5 +Delayed::Worker.max_run_time = 40.minutes
  6 +Delayed::Worker.default_priority = 20
6 7
7 #class Delayed::Worker 8 #class Delayed::Worker
8 # alias_method :original_handle_failed_job, :handle_failed_job 9 # alias_method :original_handle_failed_job, :handle_failed_job
db/migrate/20110131154228_convert_last_error_to_text_in_delayed_jobs.rb 0 → 100644
  Diff comments   View file @52344de
@@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
  1 +class ConvertLastErrorToTextInDelayedJobs < ActiveRecord::Migration
  2 + def self.up
  3 + change_column(:delayed_jobs, :last_error, :text)
  4 + add_index :delayed_jobs, [:priority, :run_at], :name => 'delayed_jobs_priority'
  5 + end
  6 +
  7 + def self.down
  8 + change_column(:delayed_jobs, :last_error, :string)
  9 + remove_index :delayed_jobs, :name => :delayed_jobs_priority
  10 + end
  11 +end
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 # 9 #
10 # It's strongly recommended to check this file into your version control system. 10 # It's strongly recommended to check this file into your version control system.
11 11
12 -ActiveRecord::Schema.define(:version => 20110124211740) do 12 +ActiveRecord::Schema.define(:version => 20110131154228) do
13 13
14 create_table "appearances", :force => true do |t| 14 create_table "appearances", :force => true do |t|
15 t.integer "voter_id" 15 t.integer "voter_id"
@@ -66,7 +66,7 @@ ActiveRecord::Schema.define(:version =&gt; 20110124211740) do @@ -66,7 +66,7 @@ ActiveRecord::Schema.define(:version =&gt; 20110124211740) do
66 t.integer "priority", :default => 0 66 t.integer "priority", :default => 0
67 t.integer "attempts", :default => 0 67 t.integer "attempts", :default => 0
68 t.text "handler" 68 t.text "handler"
69 - t.string "last_error" 69 + t.text "last_error"
70 t.datetime "run_at" 70 t.datetime "run_at"
71 t.datetime "locked_at" 71 t.datetime "locked_at"
72 t.datetime "failed_at" 72 t.datetime "failed_at"
@@ -75,6 +75,8 @@ ActiveRecord::Schema.define(:version =&gt; 20110124211740) do @@ -75,6 +75,8 @@ ActiveRecord::Schema.define(:version =&gt; 20110124211740) do
75 t.datetime "updated_at" 75 t.datetime "updated_at"
76 end 76 end
77 77
  78 + add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
  79 +
78 create_table "densities", :force => true do |t| 80 create_table "densities", :force => true do |t|
79 t.integer "question_id" 81 t.integer "question_id"
80 t.float "value" 82 t.float "value"