From 52344de211b27da9b4ea257424efe3ca684a7ad9 Mon Sep 17 00:00:00 2001
From: Luke Baker <lukebaker@gmail.com>
Date: Mon, 31 Jan 2011 12:32:51 -0500
Subject: [PATCH] upgrade delayed_job and modify db schema for delayed_job

---
 config/environment.rb                                                   |  2 +-
 config/initializers/delayed_job.rb                                      |  5 +++--
 db/migrate/20110131154228_convert_last_error_to_text_in_delayed_jobs.rb | 11 +++++++++++
 db/schema.rb                                                            |  6 ++++--
 4 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 db/migrate/20110131154228_convert_last_error_to_text_in_delayed_jobs.rb

diff --git a/config/environment.rb b/config/environment.rb
index f2612a7..8894e4d 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -51,7 +51,7 @@ Rails::Initializer.run do |config|
     :lib     => 'fastercsv',
     :version => '1.5.1'
   config.gem 'delayed_job',
-    :version => '2.0.3'
+    :version => '2.0.6'
   config.gem 'redis',
     :version => '1.0.7'
   config.gem 'newrelic_rpm',
diff --git a/config/initializers/delayed_job.rb b/config/initializers/delayed_job.rb
index 1355b25..ce8f505 100644
--- a/config/initializers/delayed_job.rb
+++ b/config/initializers/delayed_job.rb
@@ -1,8 +1,9 @@
 Delayed::Worker.backend = :active_record
 Delayed::Worker.destroy_failed_jobs = false
 Delayed::Worker.sleep_delay = 5 
-Delayed::Worker.max_attempts = 3
-Delayed::Worker.max_run_time = 10.minutes
+Delayed::Worker.max_attempts = 5
+Delayed::Worker.max_run_time = 40.minutes
+Delayed::Worker.default_priority = 20
 
 #class Delayed::Worker
 #  alias_method :original_handle_failed_job, :handle_failed_job
diff --git a/db/migrate/20110131154228_convert_last_error_to_text_in_delayed_jobs.rb b/db/migrate/20110131154228_convert_last_error_to_text_in_delayed_jobs.rb
new file mode 100644
index 0000000..0af31c0
--- /dev/null
+++ b/db/migrate/20110131154228_convert_last_error_to_text_in_delayed_jobs.rb
@@ -0,0 +1,11 @@
+class ConvertLastErrorToTextInDelayedJobs < ActiveRecord::Migration
+  def self.up
+    change_column(:delayed_jobs, :last_error, :text)
+    add_index :delayed_jobs, [:priority, :run_at], :name => 'delayed_jobs_priority'
+  end
+
+  def self.down
+    change_column(:delayed_jobs, :last_error, :string)
+    remove_index :delayed_jobs, :name => :delayed_jobs_priority
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 8b51b47..82cee28 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20110124211740) do
+ActiveRecord::Schema.define(:version => 20110131154228) do
 
   create_table "appearances", :force => true do |t|
     t.integer  "voter_id"
@@ -66,7 +66,7 @@ ActiveRecord::Schema.define(:version => 20110124211740) do
     t.integer  "priority",   :default => 0
     t.integer  "attempts",   :default => 0
     t.text     "handler"
-    t.string   "last_error"
+    t.text     "last_error"
     t.datetime "run_at"
     t.datetime "locked_at"
     t.datetime "failed_at"
@@ -75,6 +75,8 @@ ActiveRecord::Schema.define(:version => 20110124211740) do
     t.datetime "updated_at"
   end
 
+  add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
+
   create_table "densities", :force => true do |t|
     t.integer  "question_id"
     t.float    "value"
--
libgit2 0.21.2