tornado: Replace deprecated IOLoop.instance alias.

Signed-off-by: Anders Kaseorg <anders@zulip.com>
zulip · Mar 17, 2022 · a9472c2 · a9472c2
1 parent cf42e66
commit a9472c2
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/tools/run-dev.py b/tools/run-dev.py
@@ -318,7 +318,7 @@ def log_request(self, handler: BaseHandler) -> None:
 
 
 def shutdown_handler(*args: Any, **kwargs: Any) -> None:
-    io_loop = IOLoop.instance()
+    io_loop = IOLoop.current()
     if io_loop._callbacks:
         io_loop.call_later(1, shutdown_handler)
     else:
@@ -373,7 +373,7 @@ def print_listeners() -> None:
 
     print_listeners()
 
-    ioloop = IOLoop.instance()
+    ioloop = IOLoop.current()
     for s in (signal.SIGINT, signal.SIGTERM):
         signal.signal(s, shutdown_handler)
     ioloop.start()

diff --git a/zerver/lib/queue.py b/zerver/lib/queue.py
@@ -302,7 +302,7 @@ def _on_connection_open_error(
             "TornadoQueueClient couldn't connect to RabbitMQ, retrying in %d secs...",
             retry_secs,
         )
-        ioloop.IOLoop.instance().call_later(retry_secs, self._reconnect)
+        ioloop.IOLoop.current().call_later(retry_secs, self._reconnect)
 
     def _on_connection_closed(
         self, connection: pika.connection.Connection, reason: Exception
@@ -313,7 +313,7 @@ def _on_connection_closed(
             "TornadoQueueClient lost connection to RabbitMQ, reconnecting in %d secs...",
             retry_secs,
         )
-        ioloop.IOLoop.instance().call_later(retry_secs, self._reconnect)
+        ioloop.IOLoop.current().call_later(retry_secs, self._reconnect)
 
     def _on_open(self, connection: pika.connection.Connection) -> None:
         assert self.connection is not None

diff --git a/zerver/management/commands/runtornado.py b/zerver/management/commands/runtornado.py
@@ -90,7 +90,7 @@ def inner_run() -> None:
                 add_client_gc_hook(missedmessage_hook)
                 setup_tornado_rabbitmq()
 
-                instance = ioloop.IOLoop.instance()
+                instance = ioloop.IOLoop.current()
                 instance.start()
             except KeyboardInterrupt:
                 # Monkey patch tornado.autoreload to prevent it from continuing

diff --git a/zerver/tornado/event_queue.py b/zerver/tornado/event_queue.py
@@ -250,7 +250,7 @@ def timeout_callback() -> None:
             heartbeat_event = create_heartbeat_event()
             self.add_event(heartbeat_event)
 
-        ioloop = tornado.ioloop.IOLoop.instance()
+        ioloop = tornado.ioloop.IOLoop.current()
         interval = HEARTBEAT_MIN_FREQ_SECS + random.randint(0, 10)
         if self.client_type_name != "API: heartbeat test":
             self._timeout_handle = ioloop.call_later(interval, timeout_callback)
@@ -269,7 +269,7 @@ def disconnect_handler(self, client_closed: bool = False) -> None:
         self.current_handler_id = None
         self.current_client_name = None
         if self._timeout_handle is not None:
-            ioloop = tornado.ioloop.IOLoop.instance()
+            ioloop = tornado.ioloop.IOLoop.current()
             ioloop.remove_timeout(self._timeout_handle)
             self._timeout_handle = None
 
@@ -607,12 +607,12 @@ def send_restart_events(immediate: bool = False) -> None:
 def handle_sigterm(server: tornado.httpserver.HTTPServer) -> NoReturn:
     logging.warning("Got SIGTERM, shutting down...")
     server.stop()
-    tornado.ioloop.IOLoop.instance().stop()
+    tornado.ioloop.IOLoop.current().stop()
     sys.exit(1)
 
 
 def setup_event_queue(server: tornado.httpserver.HTTPServer, port: int) -> None:
-    ioloop = tornado.ioloop.IOLoop.instance()
+    ioloop = tornado.ioloop.IOLoop.current()
 
     if not settings.TEST_SUITE:
         load_event_queues(port)