Skip to content

Remove the query logger when the query_logger() block raises #1373

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kratos0718 wants to merge 1 commit into
base: master
Choose a base branch
from
+16 −2
Open

Remove the query logger when the query_logger() block raises #1373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions asyncpg/connection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1932,8 +1932,10 @@ def __call__(self, record):
.. versionadded:: 0.29.0
"""
self.add_query_logger(callback)
yield
self.remove_query_logger(callback)
try:
yield
finally:
self.remove_query_logger(callback)

@contextlib.contextmanager
def _time_and_log(self, query, args, timeout):
Expand Down
12 changes: 12 additions & 0 deletions tests/test_logging.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,15 @@ async def test_error_logging(self):
type(log.records[0].exception),
exceptions.UndefinedColumnError
)

async def test_logging_context_removed_on_error(self):
log = LogCollector()
with self.assertRaises(exceptions.UndefinedColumnError):
with self.con.query_logger(log):
await self.con.execute("SELECT x")

self.assertEqual(len(self.con._query_loggers), 0)

await self.con.execute("SELECT 1")
await asyncio.sleep(0) # wait for logging
self.assertEqual(len(log.records), 1)