Merge pull request #862 from zyguan/revert-599fbce

revert 599fbce
This commit is contained in:
Eli Uriegas 2017-07-31 13:51:04 -07:00 committed by GitHub
commit 2228104bff
2 changed files with 23 additions and 4 deletions

View File

@ -33,9 +33,7 @@ class Sanic:
logging.config.dictConfig(log_config) logging.config.dictConfig(log_config)
# Only set up a default log handler if the # Only set up a default log handler if the
# end-user application didn't set anything up. # end-user application didn't set anything up.
if not (logging.root.handlers and if not logging.root.handlers and log.level == logging.NOTSET:
log.level == logging.NOTSET and
log_config):
formatter = logging.Formatter( formatter = logging.Formatter(
"%(asctime)s: %(levelname)s: %(message)s") "%(asctime)s: %(levelname)s: %(message)s")
handler = logging.StreamHandler() handler = logging.StreamHandler()

View File

@ -1,5 +1,7 @@
import asyncio
import uuid import uuid
from importlib import reload
from sanic.config import LOGGING
from sanic.response import text from sanic.response import text
from sanic import Sanic from sanic import Sanic
from io import StringIO from io import StringIO
@ -10,6 +12,11 @@ function: %(funcName)s(); \
message: %(message)s''' message: %(message)s'''
def reset_logging():
logging.shutdown()
reload(logging)
def test_log(): def test_log():
log_stream = StringIO() log_stream = StringIO()
for handler in logging.root.handlers[:]: for handler in logging.root.handlers[:]:
@ -32,5 +39,19 @@ def test_log():
log_text = log_stream.getvalue() log_text = log_stream.getvalue()
assert rand_string in log_text assert rand_string in log_text
def test_default_log_fmt():
reset_logging()
Sanic()
for fmt in [h.formatter for h in logging.getLogger('sanic').handlers]:
assert fmt._fmt == LOGGING['formatters']['simple']['format']
reset_logging()
Sanic(log_config=None)
for fmt in [h.formatter for h in logging.getLogger('sanic').handlers]:
assert fmt._fmt == "%(asctime)s: %(levelname)s: %(message)s"
if __name__ == "__main__": if __name__ == "__main__":
test_log() test_log()