Skip to content

Commit f59af17

Browse files
committed
s/logger/query_logger/, report BaseException too
1 parent 3d2924a commit f59af17

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

asyncpg/connection.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -1803,7 +1803,7 @@ async def _execute(
18031803
return result
18041804

18051805
@contextlib.contextmanager
1806-
def logger(self, callback):
1806+
def query_logger(self, callback):
18071807
"""Context manager that adds `callback` to the list of query loggers,
18081808
and removes it upon exit.
18091809
@@ -1822,15 +1822,15 @@ def __init__(self):
18221822
self.queries = []
18231823
def __call__(self, record):
18241824
self.queries.append(record.query)
1825-
>>> with con.logger(QuerySaver()) as log:
1825+
>>> with con.query_logger(QuerySaver()):
18261826
>>> await con.execute("SELECT 1")
18271827
>>> print(log.queries)
18281828
['SELECT 1']
18291829
18301830
.. versionadded:: 0.29.0
18311831
"""
18321832
self.add_query_logger(callback)
1833-
yield callback
1833+
yield
18341834
self.remove_query_logger(callback)
18351835

18361836
@contextlib.contextmanager
@@ -1839,7 +1839,7 @@ def _time_and_log(self, query, args, timeout):
18391839
exception = None
18401840
try:
18411841
yield
1842-
except Exception as ex:
1842+
except BaseException as ex:
18431843
exception = ex
18441844
raise
18451845
finally:

0 commit comments

Comments
 (0)