paulnicholson-ar_mailer 2.1.5 → 2.1.6

data/generators/ar_mailer/templates/migration.rb

@@ -7,6 +7,7 @@ class <%= migration_name %> < ActiveRecord::Migration
       t.text :mail
       t.timestamps
     end
+    add_index :<%= table_name %>, [:priority, :id]
   end
 
   def self.down

data/lib/action_mailer/ar_sendmail.rb

@@ -42,7 +42,7 @@ class ActionMailer::ARSendmail
   ##
   # The version of ActionMailer::ARSendmail you are running.
 
-  VERSION = '2.1.5'
+  VERSION = '2.1.6'
 
   ##
   # Maximum number of times authentication will be consecutively retried
@@ -98,7 +98,7 @@ class ActionMailer::ARSendmail
   # to learn how to enable ActiveRecord::Timestamp.
 
   def self.mailq
-    emails = ActionMailer::Base.email_class.find(:all, :order=>:priority)
+    emails = ActionMailer::Base.email_class.find(:all, :order=> 'priority, id')
 
     if emails.empty? then
       puts "Mail queue is empty"
@@ -425,7 +425,7 @@ class ActionMailer::ARSendmail
   # last 300 seconds.
 
   def find_emails
-    options = { :conditions => ['last_send_attempt < ?', Time.now.to_i - 300], :order=>:priority}
+    options = { :conditions => ['last_send_attempt < ?', Time.now.to_i - 300], :order=> 'priority, id'}
     options[:limit] = batch_size unless batch_size.nil?
     mail = ActionMailer::Base.email_class.find :all, options
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: paulnicholson-ar_mailer
 version: !ruby/object:Gem::Version 
-  version: 2.1.5
+  version: 2.1.6
 platform: ruby
 authors: 
 - Eric Hodel
@@ -45,6 +45,7 @@ files:
 - test/test_helper.rb
 has_rdoc: false
 homepage: http://github.com/adzap/ar_mailer
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --main
@@ -66,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: seattlerb
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: A two-phase delivery agent for ActionMailer