implement next-round voting. still need !vote command

[erebus.git] / ctlmod.py

diff --git a/ctlmod.py b/ctlmod.py
index 9a30c7e2c0f54c54f7ae2110bba9eb1a3bc3b5a9..18876a0d30ed0d923e85b2460d7e6707a0242d09 100644 (file)
--- a/ctlmod.py
+++ b/ctlmod.py
@@ -12,8 +12,12 @@ def modhas(modname, attname): return getattr(modules[modname], attname, None) is
 
 def load(parent, modname):
        if not isloaded(modname):
-               mod = __import__(modname)
-               reload(mod)
+               try:
+                       mod = __import__(modname)
+                       reload(mod)
+               except BaseException as e: #we don't want even sys.exit() to crash us (in case of malicious module) so use BaseException
+                       return modlib.error(e)
+                       
 
                if not hasattr(mod, 'modinfo'):
                        return modlib.error('no modinfo')
@@ -59,13 +63,17 @@ def reloadmod(parent, modname):
                if modhas(modname, 'modrestart'): modules[modname].modrestart(parent)
                else: modules[modname].modstop(parent)
 
-               reload(modules[modname])
+               try:
+                       return reload(modules[modname])
+               except BaseException as e:
+                       return modlib.error(e)
 
                if modhas(modname, 'modrestarted'): modules[modname].modrestarted(parent)
                else: modules[modname].modstart(parent)
 
        else:
-               load(parent, modname)
+               return load(parent, modname)
+
 
 def loadall(parent, modlist):
        for m in modlist: load(parent, m)