0
@@ -401,7 +401,7 @@
0
     return if @max_age == 0
0
     timeout = Time.now - @max_age
0
     conditions = ['last_send_attempt > 0 and created_on < ?', timeout]
0
-    mail = @email_class.destroy_all conditions
0
+    mail = @email_class.find(conditions).delete rescue []
0
 
0
     log "expired #{mail.length} emails from the queue"
0
   end
0
0
@@ -410,12 +410,14 @@
0
   # Delivers +emails+ to Merb::Mailer's SMTP server and destroys them.
0
 
0
   def deliver(emails)
0
+    raise "You must setup Merb::Mailer.config" if Merb::Mailer.config.nil? 
0
+    
0
     user = Merb::Mailer.config[:user] || Merb::Mailer.config[:user_name]
0
     Net::SMTP.start Merb::Mailer.config[:host], 
0
                     Merb::Mailer.config[:port],
0
                     Merb::Mailer.config[:domain], 
0
                     user,
0
-                    Merb::Mailer.config[:password],
0
+                    Merb::Mailer.config[:pass],
0
                     Merb::Mailer.config[:auth],
0
                     Merb::Mailer.config[:tls] do |smtp|
0
       @failed_auth_count = 0
0
0
0
@@ -470,11 +472,13 @@
0
   # last 300 seconds.
0
 
0
   def find_emails
0
-    options = { :conditions => ['last_send_attempt < ?', Time.now.to_i - 300] }
0
+    
0
     options[:limit] = batch_size unless batch_size.nil?
0
-    mail = @email_class.find :all, options
0
+    query = @email_class.filter("last_send_attempt < #{Time.now.to_i - 300}")
0
+    query.limit(batch_size) unless batch_size.nil?
0
+    mail = query.all
0
 
0
-    log "found #{mail.length} emails to send"
0
+    log "found #{mail.size} emails to send"
0
     mail
0
   end
0
 
0
@@ -491,7 +495,7 @@
0
 
0
   def log(message)
0
     $stderr.puts message if @verbose
0
-    ActionMailer::Base.logger.info "ar_sendmail: #{message}"
0
+    Merb.logger.info "ar_sendmail: #{message}"
0
   end
0
 
0
   ##