Fixed bugs of exception logging (#215)

rabbitmq-community · Nov 4, 2024 · 42a59fb · 42a59fb
1 parent e0bde68
commit 42a59fb
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/rstream/client.py b/rstream/client.py
@@ -361,9 +361,9 @@ async def close(self) -> None:
                     )
 
                 except asyncio.TimeoutError:
-                    logger.warning("timeout in client close() sync_request:")
-                except BaseException as exc:
-                    logger.exception("exception in client close() sync_request", exc)
+                    logger.warning("timeout in client close() sync_request")
+                except BaseException:
+                    logger.exception("exception in client close() sync_request")
 
         self._is_not_closed = False
         await asyncio.sleep(0.2)

diff --git a/rstream/consumer.py b/rstream/consumer.py
@@ -321,7 +321,7 @@ async def unsubscribe(self, subscriber_name: str) -> None:
         except asyncio.TimeoutError:
             logger.warning("timeout when closing consumer and deleting publisher")
         except BaseException as exc:
-            logger.warning("exception in unsubscribe of Consumer:" + str(exc))
+            logger.warning("exception in unsubscribe of Consumer: %s", exc)
 
         stream = subscriber.stream
 

diff --git a/rstream/producer.py b/rstream/producer.py
@@ -181,8 +181,8 @@ async def close(self) -> None:
                     await asyncio.wait_for(publisher.client.delete_publisher(publisher.id), 5)
                 except asyncio.TimeoutError:
                     logger.warning("timeout when closing producer and deleting publisher")
-                except BaseException as exc:
-                    logger.exception("exception in delete_publisher in Producer.close:", exc)
+                except BaseException:
+                    logger.exception("exception in delete_publisher in Producer.close")
             publisher.client.remove_handler(schema.PublishConfirm, publisher.reference)
             publisher.client.remove_handler(schema.PublishError, publisher.reference)
             publisher.client.remove_handler(schema.MetadataUpdate, publisher.reference)
@@ -262,11 +262,11 @@ async def _get_or_create_publisher(
 
         except StreamDoesNotExist as e:
             await self._maybe_clean_up_during_lost_connection(stream)
-            logger.exception("Error in _get_or_create_publisher: stream does not exists anymore", e)
+            logger.exception("Error in _get_or_create_publisher: stream does not exists anymore")
             raise e
         except Exception as ex:
             await self._maybe_clean_up_during_lost_connection(stream)
-            logger.exception("error declaring publisher: ", ex)
+            logger.exception("error declaring publisher")
             raise ex
 
         logger.debug("_get_or_create_publisher(): Adding handlers")
@@ -615,10 +615,10 @@ async def _timer(self):
                 for stream in self._buffered_messages:
                     try:
                         await self._publish_buffered_messages(stream)
-                    except BaseException as exc:
-                        logger.exception("producer _timer exception: ", {exc})
-        except Exception as ex:
-            logger.exception("exception in _timer: " + str(ex))
+                    except BaseException:
+                        logger.exception("producer _timer exception")
+        except Exception:
+            logger.exception("exception in _timer")
 
     async def _publish_buffered_messages(self, stream: str) -> None:
         logger.debug("publishing message with _publish_buffered_messages")