add load OK checking/logging to bot statup module loading

[erebus.git] / ctlmod.py

diff --git a/ctlmod.py b/ctlmod.py
index 73ae1fcd015d228180dc7ad8de64dc7a21f6072d..db8a5b88f63a3d1a35a5495341cbd57f7f8b98f5 100644 (file)
--- a/ctlmod.py
+++ b/ctlmod.py
@@ -12,8 +12,15 @@ def modhas(modname, attname): return getattr(modules[modname], attname, None) is
 
 def load(parent, modname):
        if not isloaded(modname):
-               mod = __import__(modname)
-               reload(mod)
+               sys.path.insert(0, 'modules')
+               try:
+                       mod = __import__(modname)
+                       reload(mod) #in case it's been previously loaded.
+               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)
+               finally:
+                       del sys.path[0] #remove ./modules from path, in case there's a name conflict
+
 
                if not hasattr(mod, 'modinfo'):
                        return modlib.error('no modinfo')
@@ -60,13 +67,14 @@ def reloadmod(parent, modname):
                else: modules[modname].modstop(parent)
 
                try:
-                       return reload(modules[modname])
-               except BaseException, e:
+                       reload(modules[modname])
+               except BaseException as e:
                        return modlib.error(e)
 
-               if modhas(modname, 'modrestarted'): modules[modname].modrestarted(parent)
-               else: modules[modname].modstart(parent)
+               if modhas(modname, 'modrestarted'): ret = modules[modname].modrestarted(parent)
+               else: ret = modules[modname].modstart(parent)
 
+               return ret
        else:
                return load(parent, modname)