oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix bytes sent stats

Browse source
This commit is contained in:
shortcutme 2017-10-13 01:22:16 +02:00
parent d32303de57
commit 19c335e39a
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/Connection/Connection.py
View file

@ -420,21 +420,22 @@ class Connection(object):
self.last_sent_time = time.time() self.last_sent_time = time.time()
return True return True
# Stream raw file to connection # Stream file to connection without msgpacking
def sendRawfile(self, file, read_bytes): def sendRawfile(self, file, read_bytes):
buff = 64 * 1024 buff = 64 * 1024
bytes_left = read_bytes bytes_left = read_bytes
bytes_sent = 0
while True: while True:
self.last_send_time = time.time() self.last_send_time = time.time()
data = file.read(min(bytes_left, buff))
bytes_sent += len(data)
with self.send_lock: with self.send_lock:
self.sock.sendall( self.sock.sendall(data)
file.read(min(bytes_left, buff))
)
bytes_left -= buff bytes_left -= buff
if bytes_left <= 0: if bytes_left <= 0:
break break
self.bytes_sent += read_bytes self.bytes_sent += bytes_sent
self.server.bytes_sent += read_bytes self.server.bytes_sent += bytes_sent
self.server.stat_sent["raw_file"]["num"] += 1 self.server.stat_sent["raw_file"]["num"] += 1
self.server.stat_sent["raw_file"]["bytes"] += bytes_sent self.server.stat_sent["raw_file"]["bytes"] += bytes_sent
return True return True