Pathogen
/
monolith
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Additional checks when disabling or deleting bots

This commit is contained in:
Mark Veidemanis 2018-02-03 19:43:54 +00:00
parent aacb50d5d2
commit 57e54cbced
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
threshold
View File

@ -670,7 +670,8 @@ class Helper(object):
if spl[1] in FactoryPool.keys(): if spl[1] in FactoryPool.keys():
FactoryPool[spl[1]].stopTrying() FactoryPool[spl[1]].stopTrying()
ReactorPool[spl[1]].disconnect() ReactorPool[spl[1]].disconnect()
del IRCPool[spl[1]] if spl[1] in IRCPool.keys():
del IRCPool[spl[1]]
del ReactorPool[spl[1]] del ReactorPool[spl[1]]
del FactoryPool[spl[1]] del FactoryPool[spl[1]]
success("Successfully disabled bot %s" % spl[1]) success("Successfully disabled bot %s" % spl[1])
@ -998,10 +999,14 @@ class Helper(object):
failure("Name does not exist: %s" % spl[1]) failure("Name does not exist: %s" % spl[1])
return return
del pool[spl[1]] del pool[spl[1]]
if spl[1] in IRCPool.keys(): if spl[1] in ReactorPool.keys():
if IRCPool[spl[1]].connected == True: if spl[1] in FactoryPool.keys():
IRCPool[spl[1]].transport.loseConnection() FactoryPool[spl[1]].stopTrying()
del IRCPool[spl[1]] ReactorPool[spl[1]].disconnect()
if spl[1] in IRCPool.keys():
del IRCPool[spl[1]]
del ReactorPool[spl[1]]
del FactoryPool[spl[1]]
success("Successfully removed bot") success("Successfully removed bot")
self.save("pool") self.save("pool")
return return