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

move get_poll_timeout() to event loop now that it is the one calling _check

Browse source
This commit is contained in:
jesopo 2019-06-23 19:00:37 +01:00
parent 9673963a8d
commit dd1df4dc05
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/IRCBot.py
View file

@ -207,7 +207,7 @@ class Bot(object):
timeouts.append(self.next_read_timeout()) timeouts.append(self.next_read_timeout())
timeouts.append(self.cache.next_expiration()) timeouts.append(self.cache.next_expiration())
min_secs = min([timeout for timeout in timeouts if not timeout == None]) min_secs = min([timeout for timeout in timeouts if not timeout == None])
return min_secs*1000 # return milliseconds return min_secs
def disconnect(self, server: IRCServer.Server): def disconnect(self, server: IRCServer.Server):
del self.servers[server.fileno()] del self.servers[server.fileno()]
@ -277,7 +277,13 @@ class Bot(object):
self._check() self._check()
item = self._event_queue.get(block=True, timeout=None) try:
item = self._event_queue.get(block=True,
timeout=self.get_poll_timeout())
except queue.Empty:
# caused by timeout being hit. loop back round because a _check
# call is due
continue
if item.type == TriggerEventType.Action: if item.type == TriggerEventType.Action:
try: try:
@ -336,7 +342,7 @@ class Bot(object):
def _read_loop(self): def _read_loop(self):
while self.running: while self.running:
events = self._read_poll.poll(self.get_poll_timeout()) events = self._read_poll.poll()
for fd, event in events: for fd, event in events: