Changeset 727

Timestamp:

11/16/07 13:10:53 (1 year ago)

Author:

markku

Message:

Closes #493

Files:

• trunk/app/models/cmms_mailer_base.rb (modified) (1 diff)

trunk/app/models/cmms_mailer_base.rb

@@ -7 +7 @@
-# Base class action mailers
-#
+# Inherits:
+# ---------
+# <ActionMailer::Base>
+#
-class CmmsMailerBase < ActionMailer::Base
-  # The 'from' attribute in emails
-  cattr_accessor :email_sender
+
+  # Constant: MAX_DELIVERY_ATTEMPTS
+  # ===============================
+  # The maximum number of mail delivery attemps made by the <deliver!>
+  # method when delivery fails with a "temporary" error code.
+  #
+  MAX_DELIVERY_ATTEMPTS = 10
+
+  # Method: deliver!
+  # ================
+  # Does the same as the original implementation is the Base class.
+  # In addition rescues exceptions raised by Net::SMTP and also
+  # some raised by TCPSocket. The errors are logged and "forgotten".
+  #
+  def deliver!(*args)
+    begin
+      super(*args)
+    rescue Net::SMTPServerBusy => e
+      # Try again MAX_DELIVERY_ATTEMPTS times
+      @delivery_attempt_count ||= 0
+      if @delivery_attempt_count < MAX_DELIVERY_ATTEMPTS
+        @delivery_attempt_count += 1
+        deliver!(*args)
+      end
+      CmmsMailerBase._error("SMTP server busy: #{e}. Failed to deliver mail.")
+      # Reset counter
+      @delivery_attempt_count = 0
+    rescue TimeoutError => e
+      CmmsMailerBase._error("Timeout error: #{e}. Failed to deliver mail.")
+    rescue Net::SMTPAuthenticationError => e
+      CmmsMailerBase._error("SMTP authentication error: #{e}. Failed to deliver mail.")
+    rescue Net::SMTPSyntaxError => e
+      CmmsMailerBase._error("SMTP syntax error: #{e}. Failed to deliver mail.")
+    rescue Net::SMTPFatalError => e
+      CmmsMailerBase._error("SMTP fatal error: #{e}. Failed to deliver mail.")
+    rescue Net::SMTPUnknownError => e
+      CmmsMailerBase._error("SMTP unknown error: #{e}. Failed to deliver mail.")
+    rescue Errno::ECONNREFUSED => e
+      # Raised by TCPSocket when SMTP server is not found on GNU/Linux.
+      CmmsMailerBase._error("TCP socket error: #{e}. Failed to deliver mail.")
+    rescue Errno::EBADF => e
+      # Raised by TCPSocket when SMTP server is not found on Windows XP.
+      CmmsMailerBase._error("TCP socket error: #{e}. Failed to deliver mail.")
+    end
+  end
-end