Skip to content

Commit 83b6ea5

Browse files
committed
set default level of logger "gino" to WARNING
Fixes #710
1 parent d876f78 commit 83b6ea5

File tree

2 files changed

+26
-14
lines changed

2 files changed

+26
-14
lines changed

src/gino/__init__.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
1+
import logging
2+
13
from .api import Gino # NOQA
24
from .bakery import Bakery
35
from .engine import GinoEngine, GinoConnection # NOQA
46
from .exceptions import * # NOQA
57
from .strategies import GinoStrategy # NOQA
68

9+
rootlogger = logging.getLogger("gino")
10+
if rootlogger.level == logging.NOTSET:
11+
rootlogger.setLevel(logging.WARN)
12+
713

814
def create_engine(*args, **kwargs):
915
"""

tests/test_engine.py

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -100,20 +100,26 @@ async def test_compile(engine):
100100

101101

102102
async def test_logging(mocker):
103-
mocker.patch("logging.Logger._log")
104-
sql = "SELECT NOW() AS test_logging"
105-
106-
e = await create_engine(PG_URL, echo=False)
107-
await e.scalar(sql)
108-
await e.close()
109-
# noinspection PyProtectedMember,PyUnresolvedReferences
110-
logging.Logger._log.assert_not_called()
111-
112-
e = await create_engine(PG_URL, echo=True)
113-
await e.scalar(sql)
114-
await e.close()
115-
# noinspection PyProtectedMember,PyUnresolvedReferences
116-
logging.Logger._log.assert_any_call(logging.INFO, sql, ())
103+
orig_level = logging.root.level
104+
# #710: the level of logger "gino" should not be NOTSET, thus not affected by root
105+
logging.root.setLevel(logging.DEBUG)
106+
try:
107+
mocker.patch("logging.Logger._log")
108+
sql = "SELECT NOW() AS test_logging"
109+
110+
e = await create_engine(PG_URL, echo=False)
111+
await e.scalar(sql)
112+
await e.close()
113+
# noinspection PyProtectedMember,PyUnresolvedReferences
114+
logging.Logger._log.assert_not_called()
115+
116+
e = await create_engine(PG_URL, echo=True)
117+
await e.scalar(sql)
118+
await e.close()
119+
# noinspection PyProtectedMember,PyUnresolvedReferences
120+
logging.Logger._log.assert_any_call(logging.INFO, sql, ())
121+
finally:
122+
logging.root.setLevel(orig_level)
117123

118124

119125
async def test_set_isolation_level():

0 commit comments

Comments
 (0)