Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

Do throttling based on line count, not byte count

Browse source
This commit is contained in:
jesopo 2018-08-28 17:30:14 +01:00
parent b9d4e11b77
commit 423eacaefe
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
IRCServer.py
View file

@ -2,6 +2,7 @@ import collections, socket, ssl, sys, time
import IRCChannel, IRCLineHandler, IRCUser import IRCChannel, IRCLineHandler, IRCUser
OUR_TLS_PROTOCOL = ssl.PROTOCOL_SSLv23 OUR_TLS_PROTOCOL = ssl.PROTOCOL_SSLv23
THROTTLE_LINES = 4
if hasattr(ssl, "PROTOCOL_TLS"): if hasattr(ssl, "PROTOCOL_TLS"):
OUR_TLS_PROTOCOL = ssl.PROTOCOL_TLS OUR_TLS_PROTOCOL = ssl.PROTOCOL_TLS
@ -20,6 +21,7 @@ class Server(object):
self.original_username = username or nickname self.original_username = username or nickname
self.original_realname = realname or nickname self.original_realname = realname or nickname
self.write_buffer = b"" self.write_buffer = b""
self.buffered_lines = []
self.read_buffer = b"" self.read_buffer = b""
self.users = {} self.users = {}
self.new_users = set([]) self.new_users = set([])
@ -214,15 +216,19 @@ class Server(object):
encoded = data.split("\n")[0].strip("\r").encode("utf8") encoded = data.split("\n")[0].strip("\r").encode("utf8")
if len(encoded) > 450: if len(encoded) > 450:
encoded = encoded[:450] encoded = encoded[:450]
self.write_buffer += encoded + b"\r\n" self.buffered_lines.append(encoded + b"\r\n")
if self.bot.args.verbose: if self.bot.args.verbose:
print(encoded.decode("utf8")) print(encoded.decode("utf8"))
def _send(self): def _send(self):
if self.write_buffer == b"":
self.write_buffer = b"".join(self.buffered_lines[:
THROTTLE_LINES])
self.buffered_lines = self.buffered_lines[THROTTLE_LINES:]
self.write_buffer = self.write_buffer[self.socket.send( self.write_buffer = self.write_buffer[self.socket.send(
self.write_buffer[:512]):] self.write_buffer):]
self.last_send = time.monotonic() self.last_send = time.monotonic()
def waiting_send(self): def waiting_send(self):
return bool(len(self.write_buffer)) return bool(len(self.write_buffer)) or bool(len(self.buffered_lines))
def throttle_done(self): def throttle_done(self):
return self.send_throttle_timeout() == 0 return self.send_throttle_timeout() == 0
def send_throttle_timeout(self): def send_throttle_timeout(self):