dvdplm-ar_mailer 2.0.3 → 2.0.4

data/lib/action_mailer/ar_sendmail.rb

@@ -113,12 +113,16 @@ class Create#{table_name.classify} < ActiveRecord::Migration
       t.column :mail, :text
       t.column :last_send_attempt, :integer, :default => 0
       t.column :last_error, :text
+      t.column :success_status, :string
       t.column :attempts, :integer
       t.column :failed, :boolean, :default => false
       t.column :created_at, :datetime
       t.column :updated_at, :datetime
       t.column :sent_at, :datetime
     end
+    
+    add_index :emails, :sent_at
+    add_index :emails, :failed
   end
 
   def self.down
@@ -135,6 +139,8 @@ end
     require 'active_support'
     puts <<-EOF
 class #{table_name.classify} < ActiveRecord::Base
+  validates_presence_of :from, :to, :mail
+
   def sent?
     not failed? and not sent_at.nil?
   end
@@ -160,7 +166,7 @@ end
 
     total_size = 0
 
-    puts "-Queue ID- --Size-- ----Arrival Time---- -----Sent At------ -Attempts- -Sender/Recipient--------------------------------------"
+    puts "-Queue ID- --Size-- ----Arrival Time---- -----Last attempt at------ -Attempts- -Sender/Recipient--------------------------------------"
     emails.each do |email|
       size = email.mail.length
       total_size += size
@@ -176,12 +182,7 @@ end
                   create_timestamp.strftime '%a %b %d %H:%M:%S'
                 end
 
-      puts "%10d %8d %s %s %10d %s -> %s" % [email.id, size, created, email.sent_at || ' '*19, email.attempts, email.from, email.to]
-      if email.last_send_attempt > 0 then
-        puts "Last send attempt: #{Time.at email.last_send_attempt}"
-        puts "Attempt no: #{email.attempts}"
-      end
-      puts
+      puts "%10d %8d %s %s %10d %s -> %s" % [email.id, size, created, Time.at(email.last_send_attempt) || ' '*19, email.attempts, email.from, email.to]
     end
 
     puts "-- #{total_size/1024} Kbytes in #{emails.length} Requests."
@@ -466,6 +467,7 @@ end
           res = session.send_message email.mail, email.from, email.to
           email.failed = false
           email.sent_at = Time.now
+          email.success_status = res.string
           
           log "#{self.class}#deliver sent email %011d from %s to %s: %p" %
                 [email.id, email.from, email.to, res]
@@ -517,7 +519,6 @@ end
   # last 300 seconds.
 
   def find_emails
-    # options = { :conditions => ['last_send_attempt < ? AND failed = 0', Time.now.to_i - 300] }
     options = { :conditions => {:sent_at => nil, :failed => false}}
     options[:limit] = batch_size unless batch_size.nil?
     mail = @email_class.find :all, options

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dvdplm-ar_mailer
 version: !ruby/object:Gem::Version 
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors: 
 - Eric Hodel
@@ -15,7 +15,7 @@ date: 2009-04-17 00:00:00 -07:00
 default_executable: ar_sendmail
 dependencies: []
 
-description: Even delivering email to the local machine may take too long when you have to send hundreds of messages.  ar_mailer allows you to store messages into the database for later delivery by a separate process, ar_sendmail.
+description: Even delivering email to the local machine may take too long when you have to send hundreds of messages.  ar_mailer allows you to store messages into the database for later delivery by a separate process, ar_sendmail. This fork stores the email in the database for easy inspection and tracking.
 email: adam.meehan@gmail.com
 executables: 
 - ar_sendmail
@@ -68,7 +68,7 @@ rubyforge_project: seattlerb
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 3
-summary: A two-phase delivery agent for ActionMailer
+summary: A two-phase delivery agent and outbox archive for ActionMailer
 test_files: 
 - test/test_armailer.rb
 - test/test_arsendmail.rb