Permalink
Browse files

add renamed Timeout error class (hennk)

  • Loading branch information...
adzap committed Dec 18, 2009
1 parent 69cf1f8 commit ccc9ff02946cf46791790a69346e404c60ce9be7
Showing with 1 addition and 1 deletion.
  1. +1 −1 lib/action_mailer/ar_sendmail.rb
@@ -388,7 +388,7 @@ def deliver(emails)
rescue Net::SMTPServerBusy => e
log "server too busy, stopping delivery cycle"
return
- rescue Net::SMTPUnknownError, Net::SMTPSyntaxError, TimeoutError => e
+ rescue Net::SMTPUnknownError, Net::SMTPSyntaxError, TimeoutError, Timeout::Error => e
email.last_send_attempt = Time.now.to_i
email.save rescue nil
log "error sending email %d: %p(%s):\n\t%s" %

0 comments on commit ccc9ff0

Please sign in to comment.