Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

run-dev: Fix types. 

Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg 2022-03-21 19:58:30 -07:00 committed by Alex Vandiver
parent 6fd1a558b7
commit f23bfe91c0
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tools/run-dev.py
View File

@ -6,7 +6,7 @@ import pwd
import signal import signal
import subprocess import subprocess
import sys import sys
from typing import Any, List, Sequence from typing import List, Sequence
from urllib.parse import urlunparse from urllib.parse import urlunparse
TOOLS_DIR = os.path.dirname(os.path.abspath(__file__)) TOOLS_DIR = os.path.dirname(os.path.abspath(__file__))
@ -238,7 +238,7 @@ class BaseHandler(web.RequestHandler):
def delete(self) -> None: def delete(self) -> None:
pass pass
def handle_response(self, response: Any) -> None: def handle_response(self, response: httpclient.HTTPResponse) -> None:
if response.error and not isinstance(response.error, httpclient.HTTPError): if response.error and not isinstance(response.error, httpclient.HTTPError):
self.set_status(500) self.set_status(500)
self.write("Internal server error:\n" + str(response.error)) self.write("Internal server error:\n" + str(response.error))
@ -255,6 +255,8 @@ class BaseHandler(web.RequestHandler):
self.finish() self.finish()
async def prepare(self) -> None: async def prepare(self) -> None:
assert self.request.method is not None
assert self.request.remote_ip is not None
if "X-REAL-IP" not in self.request.headers: if "X-REAL-IP" not in self.request.headers:
self.request.headers["X-REAL-IP"] = self.request.remote_ip self.request.headers["X-REAL-IP"] = self.request.remote_ip
if "X-FORWARDED_PORT" not in self.request.headers: if "X-FORWARDED_PORT" not in self.request.headers:
@ -305,15 +307,17 @@ class TornadoHandler(BaseHandler):
class Application(web.Application): class Application(web.Application):
def __init__(self, enable_logging: bool = False) -> None: def __init__(self, enable_logging: bool = False) -> None:
handlers = [ super().__init__(
(r"/json/events.*", TornadoHandler), [
(r"/api/v1/events.*", TornadoHandler), (r"/json/events.*", TornadoHandler),
(r"/webpack.*", WebPackHandler), (r"/api/v1/events.*", TornadoHandler),
(r"/.*", DjangoHandler), (r"/webpack.*", WebPackHandler),
] (r"/.*", DjangoHandler),
super().__init__(handlers, enable_logging=enable_logging) ],
enable_logging=enable_logging,
)
def log_request(self, handler: BaseHandler) -> None: def log_request(self, handler: web.RequestHandler) -> None:
if self.settings["enable_logging"]: if self.settings["enable_logging"]:
super().log_request(handler) super().log_request(handler)