Skip to content

Commit

Permalink
Some improvements in remote proxy streaming loop
Browse files Browse the repository at this point in the history
  • Loading branch information
smclay committed Sep 21, 2020
1 parent 3dcbe5b commit 9512149
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions src/ngamsServer/ngamsServer/ngamsServer.py
Original file line number Diff line number Diff line change
Expand Up @@ -489,11 +489,15 @@ def write_stream_data(self, response, headers, size, start_byte=0, block_size=65
start_time = time.time()

# TODO: Should we do something about https here?
self.wfile.flush()
while data_sent < data_to_send:
stream_buffer = response.read(block_size)
stream_buffer_size = len(stream_buffer)
self.wfile.write(stream_buffer)
data_sent += len(stream_buffer)
data_sent += stream_buffer_size
if stream_buffer_size == 0 and data_sent < data_to_send:
logger.error("Data stream is incomplete. Only received %d bytes, expected %d bytes.",
data_sent, data_to_send)
break

elapsed_time = time.time() - start_time
# Avoid divide by zeros later on, let's say it took us 1 [us] to do this
Expand Down

0 comments on commit 9512149

Please sign in to comment.