Skip to content

Commit 023a778

Browse files
authored
Force flush buffer to avoid data corruption (#85)
1 parent dbb675d commit 023a778

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

jupyter_archive/handlers.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,10 @@ def handler_max_buffer_length(self):
102102
def archive_download_flush_delay(self):
103103
return self.settings["jupyter_archive"].archive_download_flush_delay
104104

105-
def flush(self, include_footers=False):
105+
def flush(self, include_footers=False, force=False):
106106
# skip flush when stream_buffer is larger than stream_max_buffer_size
107107
stream_buffer = self.request.connection.stream._write_buffer
108-
if stream_buffer and len(stream_buffer) > self.stream_max_buffer_size:
108+
if not force and stream_buffer and len(stream_buffer) > self.stream_max_buffer_size:
109109
return
110110
return super(DownloadArchiveHandler, self).flush(include_footers)
111111

@@ -166,7 +166,8 @@ async def get(self, archive_path, include_body=False):
166166
if self.canceled:
167167
self.log.info("Download canceled.")
168168
else:
169-
self.flush()
169+
# Here, we need to flush forcibly to move all data from _write_buffer to stream._write_buffer
170+
self.flush(force=True)
170171
self.log.info("Finished downloading {}.".format(archive_filename))
171172

172173
self.set_cookie("archiveToken", archive_token)

0 commit comments

Comments
 (0)