Add module:unload() to mod_console, and allow module:load() to take config param

diff --git a/plugins/mod_console.lua b/plugins/mod_console.lua
index 8b123df4d86f7a3485f1f1a1543cb4bc2dae6863..b1dc263cdc69f1df4530f8ddab636a4b1492c3b1 100644 (file)
--- a/plugins/mod_console.lua
+++ b/plugins/mod_console.lua
@@ -129,15 +129,24 @@ function def_env.server:reload()
 end\r
 \r
 def_env.module = {};\r
-function def_env.module:load(name, host)\r
+function def_env.module:load(name, host, config)\r
        local mm = require "modulemanager";\r
-       local ok, err = mm.load(host or self.env.host, name);\r
+       local ok, err = mm.load(host or self.env.host, name, config);\r
        if not ok then\r
                return false, err or "Unknown error loading module";\r
        end\r
        return true, "Module loaded";\r
 end\r
 \r
+function def_env.module:unload(name, host)\r
+       local mm = require "modulemanager";\r
+       local ok, err = mm.unload(host or self.env.host, name);\r
+       if not ok then\r
+               return false, err or "Unknown error unloading module";\r
+       end\r
+       return true, "Module unloaded";\r
+end\r
+\r
 def_env.config = {};\r
 function def_env.config:load(filename, format)\r
        local config_load = require "core.configmanager".load;\r