FileHandler now serves the complete file instead of chunks.

Miguel Barao
1 parent 3586cfab
Showing 1 changed file with 17 additions and 12 deletions Show diff stats
serve.py
@@ -182,7 +182,9 @@ class TopicHandler(BaseHandler):
 # Based on https://bhch.github.io/posts/2017/12/serving-large-files-with-tornado-safely-without-blocking/
 # ----------------------------------------------------------------------------
 class FileHandler(BaseHandler):
-    chunk_size = 4 * 1024 * 1024  # serve up to 4 MiB multiple times
+    SUPPORTED_METHODS = ['GET']
+
+    # chunk_size = 4 * 1024 * 1024  # serve up to 4 MiB multiple times
     @tornado.web.authenticated
     async def get(self, filename):
@@ -203,17 +205,20 @@ class FileHandler(BaseHandler):
             # divide the file into chunks and write one chunk at a time, so
             # that the write does not block the ioloop for very long.
             with f:
-                chunk = f.read(self.chunk_size)
-                while chunk:
-                    try:
-                        self.write(chunk)   # write the chunk to response
-                        await self.flush()  # flush the current chunk to socket
-                    except iostream.StreamClosedError:
-                        break  # client closed the connection
-                    finally:
-                        del chunk
-                        await asyncio.sleep(0)   # 1 nanosecond (hack)
-                    chunk = f.read(self.chunk_size)
+                self.write(f.read())
+                await self.flush()
+
+                # chunk = f.read(self.chunk_size)
+                # while chunk:
+                #     try:
+                #         self.write(chunk)   # write the chunk to response
+                #         await self.flush()  # flush the current chunk to socket
+                #     except iostream.StreamClosedError:
+                #         break  # client closed the connection
+                #     finally:
+                #         del chunk
+                #         await asyncio.sleep(0)   # 1 nanosecond (hack)
+                #     chunk = f.read(self.chunk_size)
 # ----------------------------------------------------------------------------