tornado: Construct Django BaseHandler once, not per-request.

Signed-off-by: Anders Kaseorg <[email protected]>

zerver/tornado/application.py

@@ -1,5 +1,6 @@
 import tornado.web
 from django.conf import settings
+from django.core.handlers.base import BaseHandler
 from tornado import autoreload
 
 from zerver.lib.queue import TornadoQueueClient
@@ -12,6 +13,9 @@ def setup_tornado_rabbitmq(queue_client: TornadoQueueClient) -> None:  # nocover
 
 
 def create_tornado_application() -> tornado.web.Application:
+    django_handler = BaseHandler()
+    django_handler.load_middleware()
+
     urls = (
         r"/notify_tornado",
         r"/json/events",
@@ -20,7 +24,7 @@ def create_tornado_application() -> tornado.web.Application:
     )
 
     return tornado.web.Application(
-        [(url, AsyncDjangoHandler) for url in urls],
+        [(url, AsyncDjangoHandler, dict(django_handler=django_handler)) for url in urls],
         debug=settings.DEBUG,
         autoreload=False,
         # Disable Tornado's own request logging, since we have our own

zerver/tornado/handlers.py

@@ -77,12 +77,11 @@ def finish_handler(handler_id: int, event_queue_id: str, contents: List[Dict[str
             )
 
 
-class AsyncDjangoHandler(tornado.web.RequestHandler, base.BaseHandler):
-    def __init__(self, *args: Any, **kwargs: Any) -> None:
-        super().__init__(*args, **kwargs)
+class AsyncDjangoHandler(tornado.web.RequestHandler):
+    handler_id: int
 
-        # Copied from the django.core.handlers.wsgi __init__() method.
-        self.load_middleware()
+    def initialize(self, django_handler: base.BaseHandler) -> None:
+        self.django_handler = django_handler
 
         # Prevent Tornado from automatically finishing the request
         self._auto_finish = False
@@ -111,7 +110,8 @@ async def convert_tornado_request_to_django_request(self) -> HttpRequest:
         # `get_response()`.
         set_script_prefix(get_script_name(environ))
         await sync_to_async(
-            lambda: signals.request_started.send(sender=self.__class__), thread_sensitive=True
+            lambda: signals.request_started.send(sender=self.django_handler.__class__),
+            thread_sensitive=True,
         )()
         self._request = WSGIRequest(environ)
 
@@ -156,7 +156,9 @@ async def write_django_response_as_tornado_response(self, response: HttpResponse
 
     async def get(self, *args: Any, **kwargs: Any) -> None:
         request = await self.convert_tornado_request_to_django_request()
-        response = await sync_to_async(lambda: self.get_response(request), thread_sensitive=True)()
+        response = await sync_to_async(
+            lambda: self.django_handler.get_response(request), thread_sensitive=True
+        )()
 
         try:
             if isinstance(response, AsynchronousResponse):
@@ -258,7 +260,9 @@ async def zulip_finish(self, result_dict: Dict[str, Any], old_request: HttpReque
             res_type=result_dict["result"], data=result_dict, status=self.get_status()
         )
 
-        response = await sync_to_async(lambda: self.get_response(request), thread_sensitive=True)()
+        response = await sync_to_async(
+            lambda: self.django_handler.get_response(request), thread_sensitive=True
+        )()
         try:
             # Explicitly mark requests as varying by cookie, since the
             # middleware will not have seen a session access