Merge pull request #1281 from MetPX/issue1278

close #1278 we learned that acks should never be retried
MetPX · Oct 29, 2024 · 5962139 · 5962139
2 parents 95f77aa + 179f8a2
commit 5962139
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/sarracenia/moth/amqp.py b/sarracenia/moth/amqp.py
@@ -603,13 +603,11 @@ def ack(self, m: sarracenia.Message) -> None:
             except Exception as err:
                 logger.warning("failed for tag: %s: %s" % (m['ack_id'], err))
                 logger.debug('Exception details: ', exc_info=True)
-                if type(err) == BrokenPipeError or type(err) == ConnectionResetError:
-                    # Cleanly close partially broken connection
-                    self.close()
-                    # No point in trying to ack again if the connection is broken
-                    del m['ack_id']
-                    m['_deleteOnPost'].remove('ack_id')
-                    return False
+                # No point in trying to ack again if the connection is broken
+                del m['ack_id']
+                m['_deleteOnPost'].remove('ack_id')
+                self.close()
+                return False
 
             if ebo < 60:
                 ebo *= 2