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

last_read/last_send is now handled by IRCSocket.py

Browse source
This commit is contained in:
jesopo 2019-02-11 20:49:53 +00:00
parent 6c6f1f9c2b
commit a8d9365442
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/IRCServer.py
View file

@ -58,9 +58,6 @@ class Server(IRCObject.Object):
self.motd_lines = [] # type: typing.List[str] self.motd_lines = [] # type: typing.List[str]
self.motd_done = False self.motd_done = False
self.last_read = time.monotonic()
self.last_send = None # type: typing.Optional[float]
self.attempted_join = {} # type: typing.Dict[str, typing.Optional[str]] self.attempted_join = {} # type: typing.Dict[str, typing.Optional[str]]
self.ping_sent = False self.ping_sent = False
@ -221,13 +218,13 @@ class Server(IRCObject.Object):
def until_next_ping(self) -> typing.Optional[float]: def until_next_ping(self) -> typing.Optional[float]:
if self.ping_sent: if self.ping_sent:
return None return None
return max(0, (self.last_read+PING_INTERVAL_SECONDS return max(0, (self.socket.last_read+PING_INTERVAL_SECONDS
)-time.monotonic()) )-time.monotonic())
def ping_due(self) -> bool: def ping_due(self) -> bool:
return self.until_next_ping() == 0 return self.until_next_ping() == 0
def until_read_timeout(self) -> float: def until_read_timeout(self) -> float:
return max(0, (self.last_read+READ_TIMEOUT_SECONDS return max(0, (self.socket.last_read+READ_TIMEOUT_SECONDS
)-time.monotonic()) )-time.monotonic())
def read_timed_out(self) -> bool: def read_timed_out(self) -> bool:
return self.until_read_timeout == 0 return self.until_read_timeout == 0

3
src/IRCSocket.py
View file

@ -35,6 +35,9 @@ class Socket(IRCObject.Object):
self.bytes_written = 0 self.bytes_written = 0
self.bytes_read = 0 self.bytes_read = 0
self.last_read = time.monotonic()
self.last_send = None # type: typing.Optional[float]
self.connected_ip = None self.connected_ip = None
def fileno(self) -> int: def fileno(self) -> int: