From 8739f4d9f1430d6ebac5cb7b3dc293113671ff0e Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Sat, 26 Nov 2016 19:40:18 -0800 Subject: [PATCH] tornado: Move tornado_ioloop_logging to new zerver/tornado tree. --- tools/lint-all | 2 +- zerver/management/commands/runtornado.py | 4 ++-- zerver/tornado/__init__.py | 0 .../tornado_ioloop_logging.py => tornado/ioloop_logging.py} | 0 4 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 zerver/tornado/__init__.py rename zerver/{lib/tornado_ioloop_logging.py => tornado/ioloop_logging.py} (100%) diff --git a/tools/lint-all b/tools/lint-all index 770967652b..ab6a68a693 100755 --- a/tools/lint-all +++ b/tools/lint-all @@ -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)): diff --git a/zerver/management/commands/runtornado.py b/zerver/management/commands/runtornado.py index 9edacd5ae1..376c820d62 100644 --- a/zerver/management/commands/runtornado.py +++ b/zerver/management/commands/runtornado.py @@ -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 diff --git a/zerver/tornado/__init__.py b/zerver/tornado/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/zerver/lib/tornado_ioloop_logging.py b/zerver/tornado/ioloop_logging.py similarity index 100% rename from zerver/lib/tornado_ioloop_logging.py rename to zerver/tornado/ioloop_logging.py