implement next-round voting. still need !vote command

[erebus.git] / ctlmod.py

diff --git a/ctlmod.py b/ctlmod.py
index 24dd236cfb1b3fccdca99e4e2a01efbd58398637..18876a0d30ed0d923e85b2460d7e6707a0242d09 100644 (file)
--- a/ctlmod.py
+++ b/ctlmod.py
@@ -8,14 +8,21 @@ modules = {}
 dependents = {}
 
 def isloaded(modname): return modname in modules
-def modhas(modname, attname): return getattr(self.modules[modname], attname, None) is not None
+def modhas(modname, attname): return getattr(modules[modname], attname, None) is not None
 
 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 1 not in mod.modinfo['compatible']:
+               if not hasattr(mod, 'modinfo'):
+                       return modlib.error('no modinfo')
+
+               if parent.APIVERSION not in mod.modinfo['compatible']:
                        return modlib.error('API-incompatible')
 
                modules[modname] = mod
@@ -45,22 +52,28 @@ def unload(parent, modname):
                        unload(parent, dependent)
                for dep in dependents[modname]:
                        dependents[dep].remove(modname)
-               self.modules[modname].modstop(parent)
+               ret = modules[modname].modstop(parent)
+               del modules[modname]
+               return ret
        else:
                return modlib.error('already unloaded')
 
 def reloadmod(parent, modname):
        if isloaded(modname):
-               if modhas(modname, 'modrestart'): self.modules[modname].modrestart(parent)
-               else: self.modules[modname].modstop(parent)
+               if modhas(modname, 'modrestart'): modules[modname].modrestart(parent)
+               else: modules[modname].modstop(parent)
 
-               reload(self.modules[modname])
+               try:
+                       return reload(modules[modname])
+               except BaseException as e:
+                       return modlib.error(e)
 
-               if modhas(modname, 'modrestarted'): self.modules[modname].modrestarted(parent)
-               else: self.modules[modname].modstart(parent)
+               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)