tornado: Move tornado_ioloop_logging to new zerver/tornado tree.

This commit is contained in:
Tim Abbott 2016-11-26 19:40:18 -08:00
parent 6b42b12768
commit 8739f4d9f1
4 changed files with 3 additions and 3 deletions

View File

@ -69,7 +69,7 @@ def check_pyflakes(options, by_lang):
" undefined name 'bugdown'" in ln) or
("scripts/lib/pythonrc.py" in ln and
" import *' used; unable to detect undefined names" in ln) or
("zerver/lib/tornado_ioloop_logging.py" in ln and
("zerver/tornado/ioloop_logging.py" in ln and
"redefinition of function 'instrument_tornado_ioloop'" in ln) or
("zephyr_mirror_backend.py:" in ln and
"redefinition of unused 'simplejson' from line" in ln)):

View File

@ -5,12 +5,12 @@ from typing import Any, Callable
from django.conf import settings
settings.RUNNING_INSIDE_TORNADO = True
# We must call zerver.lib.tornado_ioloop_logging.instrument_tornado_ioloop
# We must call zerver.tornado.ioloop_logging.instrument_tornado_ioloop
# before we import anything else from our project in order for our
# Tornado load logging to work; otherwise we might accidentally import
# zerver.lib.queue (which will instantiate the Tornado ioloop) before
# this.
from zerver.lib.tornado_ioloop_logging import instrument_tornado_ioloop
from zerver.tornado.ioloop_logging import instrument_tornado_ioloop
instrument_tornado_ioloop()
from django.core.management.base import BaseCommand, CommandError, CommandParser

View File