Add error handling to exec command and fix minor bug in cleaning up relays

This commit is contained in:
Mark Veidemanis 2019-10-02 21:25:15 +01:00
parent 872d08be3e
commit 89894287b3
3 changed files with 9 additions and 2 deletions

View File

@ -7,7 +7,12 @@ class ExecCommand:
def exec(self, addr, authed, data, obj, spl, success, failure, info, incUsage, length):
if authed:
if length > 1:
info(str(exec(" ".join(spl[1:]))))
try:
rtrn = exec(" ".join(spl[1:]))
except Exception as err:
failure(str(err))
return
info(str(rtrn))
return
else:
incUsage("exec")

View File

@ -223,6 +223,8 @@ class IRCBot(IRCClient):
self.setNick(self._attemptedNick)
def irc_ERR_PASSWDMISMATCH(self, prefix, params):
print(locals())
print(globals())
log("%s: password mismatch" % self.name)
sendAll("%s: password mismatch" % self.name)

View File

@ -58,7 +58,7 @@ class Network:
def seppuku(self):
# Removes all bots in preperation for deletion
self.killAliases(self.relay.keys())
self.killAliases(self.relays.keys())
def start_bot(self, num):
# a single name is given to relays in the backend