Merge pull request #23 from pck-ut-ud/DaktelaAutodialer

Remove re-raising caught exception from 'publish_message' methods

Author: matllubos

pymess/backend/dialer/daktela.py

@@ -84,7 +84,9 @@ def _update_dialer_states(self, messages):
                 )
             except Exception as ex:
                 self.update_message(message, state=DialerMessage.STATE.ERROR, error=force_text(ex))
-                raise ex
+                # Do not re-raise caught exception. We do not know exact exception to catch so we catch them all
+                # and log them into database. Re-raise exception causes transaction rollback (lost of information about
+                # exception).
 
     def publish_message(self, message):
         """
@@ -128,4 +130,6 @@ def publish_message(self, message):
             )
         except Exception as ex:
             self.update_message(message, state=DialerMessage.STATE.ERROR, error=force_text(ex))
-            raise ex
+            # Do not re-raise caught exception. We do not know exact exception to catch so we catch them all
+            # and log them into database. Re-raise exception causes transaction rollback (lost of information about
+            # exception).

pymess/backend/emails/mandrill.py

@@ -83,4 +83,5 @@ def publish_message(self, message):
                                 extra_sender_data=extra_sender_data, error=error)
         except (mandrill.Error, JSONDecodeError, requests.exceptions.RequestException) as ex:
             self.update_message(message, state=EmailMessage.STATE.ERROR, error=force_text(ex))
-            raise ex
+            # Do not re-raise caught exception. Re-raise exception causes transaction rollback (lost of information
+            # about exception).

pymess/backend/emails/smtp.py

@@ -32,4 +32,6 @@ def publish_message(self, message):
             self.update_message(message, state=EmailMessage.STATE.SENT, sent_at=timezone.now())
         except Exception as ex:
             self.update_message(message, state=EmailMessage.STATE.ERROR, error=force_text(ex))
-            raise ex
+            # Do not re-raise caught exception. We do not know exact exception to catch so we catch them all
+            # and log them into database. Re-raise exception causes transaction rollback (lost of information about
+            # exception).

pymess/backend/sms/sns.py

@@ -54,4 +54,6 @@ def publish_message(self, message):
             self.update_message(message, state=OutputSMSMessage.STATE.SENT, sent_at=timezone.now())
         except Exception as ex:
             self.update_message(message, state=OutputSMSMessage.STATE.ERROR, error=force_text(ex))
-            raise ex
+            # Do not re-raise caught exception. We do not know exact exception to catch so we catch them all
+            # and log them into database. Re-raise exception causes transaction rollback (lost of information about
+            # exception).

pymess/backend/sms/twilio.py

@@ -68,4 +68,6 @@ def publish_message(self, message):
             )
         except Exception as ex:
             self.update_message(message, state=OutputSMSMessage.STATE.ERROR, error=force_text(ex))
-            raise ex
+            # Do not re-raise caught exception. We do not know exact exception to catch so we catch them all
+            # and log them into database. Re-raise exception causes transaction rollback (lost of information about
+            # exception).