Remove unnecessary variables, optimise performance.

sanic/app.py

@@ -991,7 +991,7 @@ class Sanic:
             handler, args, kwargs, uri, name = self.router.get(request)
 
             # Non-streaming handlers have their body preloaded
-            if request.stream and not self.router.is_stream_handler(request):
+            if request.stream.request_body and not self.router.is_stream_handler(request):
                 await request.receive_body()
 
             # -------------------------------------------- #

sanic/http.py

@@ -42,7 +42,7 @@ class Http:
         "request",
         "exception",
         "url",
-        "request_chunked",
+        "request_body",
         "request_bytes_left",
         "response",
         "response_func",
@@ -56,6 +56,7 @@ class Http:
         self.protocol = protocol
         self.expecting_continue = False
         self.stage = Stage.IDLE
+        self.request_body = None
         self.keep_alive = True
         self.head_only = None
         self.request = None
@@ -77,7 +78,7 @@ class Http:
                 if self.stage is Stage.RESPONSE:
                     await self.send(end_stream=True)
                 # Consume any remaining request body (TODO: or disconnect?)
-                if self.request_bytes_left or self.request_chunked:
+                if self.request_body:
                     logger.error(f"{self.request} body not consumed.")
                     async for _ in self:
                         pass
@@ -124,12 +125,12 @@ class Http:
             else:
                 raise Exception
             self.head_only = method.upper() == "HEAD"
-            body = False
+            self.request_body = False
             headers = []
             for name, value in (h.split(":", 1) for h in raw_headers):
                 name, value = h = name.lower(), value.lstrip()
                 if name in ("content-length", "transfer-encoding"):
-                    body = True
+                    self.request_body = True
                 elif name == "connection":
                     self.keep_alive = value.lower() == "keep-alive"
                 headers.append(h)
@@ -147,9 +148,7 @@ class Http:
         request.stream = self
         self.protocol.state["requests_count"] += 1
         # Prepare for request body
-        self.request_chunked = False
+        if self.request_body:
-        self.request_bytes_left = 0
-        if body:
             headers = request.headers
             expect = headers.get("expect")
             if expect is not None:
@@ -159,7 +158,8 @@ class Http:
                     raise HeaderExpectationFailed(f"Unknown Expect: {expect}")
             request.stream = self
             if headers.get("transfer-encoding") == "chunked":
-                self.request_chunked = True
+                self.request_body = "chunked"
+                self.request_bytes_left = 0
                 pos -= 2  # One CRLF stays in buffer
             else:
                 self.request_bytes_left = int(headers["content-length"])
@@ -225,6 +225,7 @@ class Http:
             if status != 417:
                 ret = HTTP_CONTINUE + ret
         # Send response
+        if self.protocol.access_log:
             self.log_response()
         self.stage = Stage.IDLE if end_stream else Stage.RESPONSE
         return ret
@@ -284,7 +285,6 @@ class Http:
 
         :return: None
         """
-        if self.protocol.access_log:
         req, res = self.request, self.response
         extra = {
             "status": getattr(res, "status", 0),
@@ -302,10 +302,9 @@ class Http:
 
     async def __aiter__(self):
         """Async iterate over request body."""
-        while True:
+        while self.request_body:
             data = await self.read()
-            if not data:
+            if data:
-                return
                 yield data
 
     async def read(self):
@@ -316,7 +315,7 @@ class Http:
             await self._send(HTTP_CONTINUE)
         # Receive request body chunk
         buf = self.recv_buffer
-        if self.request_chunked and self.request_bytes_left == 0:
+        if self.request_body == "chunked" and self.request_bytes_left == 0:
             # Process a chunk header: \r\n<size>[;<chunk extensions>]\r\n
             while True:
                 pos = buf.find(b"\r\n", 3)

sanic/server.py

@@ -71,8 +71,6 @@ class HttpProtocol(asyncio.Protocol):
         # enable or disable access log purpose
         "access_log",
         # connection management
-        "_total_request_size",
-        "_last_response_time",
         "state",
         "url",
         "_debug",
@@ -127,7 +125,6 @@ class HttpProtocol(asyncio.Protocol):
         self.keep_alive_timeout = keep_alive_timeout
         self.request_max_size = request_max_size
         self.request_class = request_class or Request
-        self._total_request_size = 0
         self.state = state if state else {}
         if "requests_count" not in self.state:
             self.state["requests_count"] = 0