nemunaire/nemubot
1
0
Fork 0
Code Releases Activity

Fix bot close

Browse Source 
Tell consumer to stop their work
	Avoid error when select on closed fd
This commit is contained in:
nemunaire 2015-06-09 18:48:32 +02:00
parent c0e6b26b0c
commit 9cf4b9becb
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
nemubot/bot.py
View File

@ -133,23 +133,23 @@ class Bot(threading.Thread):
fnd_smth = False fnd_smth = False
# Looking for invalid server # Looking for invalid server
for r in _rlist: for r in _rlist:
if not hasattr(r, "fileno") or not isinstance(r.fileno(), int): if not hasattr(r, "fileno") or not isinstance(r.fileno(), int) or r.fileno() == -1:
_rlist.remove(r) _rlist.remove(r)
logger.error("Found invalid object in _rlist: " + r) logger.error("Found invalid object in _rlist: " + r)
fnd_smth = True fnd_smth = True
for w in _wlist: for w in _wlist:
if not hasattr(r, "fileno") or not isinstance(w.fileno(), int): if not hasattr(w, "fileno") or not isinstance(w.fileno(), int) or w.fileno() == -1:
_wlist.remove(w) _wlist.remove(w)
logger.error("Found invalid object in _wlist: " + w) logger.error("Found invalid object in _wlist: " + w)
fnd_smth = True fnd_smth = True
for x in _xlist: for x in _xlist:
if not hasattr(r, "fileno") or not isinstance(x.fileno(), int): if not hasattr(x, "fileno") or not isinstance(x.fileno(), int) or x.fileno() == -1:
_xlist.remove(x) _xlist.remove(x)
logger.error("Found invalid object in _xlist: " + x) logger.error("Found invalid object in _xlist: " + x)
fnd_smth = True fnd_smth = True
if not fnd_smth: if not fnd_smth:
logger.exception("Can't continue, sorry") logger.exception("Can't continue, sorry")
self.stop = True self.quit()
continue continue
for x in xl: for x in xl:
@ -429,6 +429,11 @@ class Bot(threading.Thread):
logger.info("Stop the event timer...") logger.info("Stop the event timer...")
self.event_timer.cancel() self.event_timer.cancel()
logger.info("Stop consumers")
k = self.cnsr_thrd
for cnsr in k:
cnsr.stop = True
logger.info("Save and unload all modules...") logger.info("Save and unload all modules...")
k = list(self.modules.keys()) k = list(self.modules.keys())
for mod in k: for mod in k: