recommended changes

Author: BioWilko

tests/test_varys.py

@@ -305,7 +305,9 @@ def tearDown(self):
     def test_not_permitted_declare_fail(self):
         self.v.send(TEXT, "test-exchange-2", queue_suffix="test_queue")
         time.sleep(0.5)
-        loglines = open(LOG_FILENAME).readlines()
+        with open(LOG_FILENAME, "r") as f:
+            loglines = f.readlines()
+
         self.assertTrue(
             any(
                 "pika.exceptions.ChannelClosedByBroker: (403, " in message
@@ -321,15 +323,15 @@ def test_send_receive_extant_queue(self):
         logger = logging.getLogger("test-exchange")
         self.assertEqual(len(logger.handlers), 1)
 
-    def test_send_nonextant_queue(self):
+    def test_send_nonexistant_queue(self):
         self.v.send(TEXT, "test-exchange", queue_suffix="test_queue_2")
         message = self.v.receive("test-exchange", queue_suffix="test_queue_2")
         self.assertEqual(TEXT, json.loads(message.body))
 
         logger = logging.getLogger("test-exchange")
         self.assertEqual(len(logger.handlers), 1)
 
-    def test_send_nonextant_exchange(self):
+    def test_send_nonexistant_exchange(self):
         self.v.send(TEXT, "test-exchange-3", queue_suffix="test_queue")
         message = self.v.receive("test-exchange-3", queue_suffix="test_queue")
         self.assertEqual(TEXT, json.loads(message.body))

varys/consumer.py

@@ -93,7 +93,9 @@ def run(self):
                         durable=True,
                     )
                 try:
-                    self._channel.queue_declare(queue=self._queue, durable=True)
+                    self._channel.queue_declare(
+                        queue=self._queue, durable=True, passive=True
+                    )
                 except pika_exceptions.ChannelClosed as e:
                     if e.reply_code != 404:
                         raise
@@ -122,7 +124,6 @@ def run(self):
                 self._channel.start_consuming()
             except Exception as e:
                 self._log.exception(f"Consumer caught exception: {e}")
-                raise
 
             if self._stopping or self._reconnect_wait < 0:
                 break

varys/producer.py

@@ -140,7 +140,6 @@ def run(self):
                     self._connection.process_data_events(time_limit=1)
             except Exception:
                 self._log.exception("Producer caught exception:")
-                raise
 
             if self._stopping:
                 self._connection.process_data_events(time_limit=0)