diff options
| author | Matthew Wild <mwild1@gmail.com> | 2012-04-21 20:52:12 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2012-04-21 20:52:12 +0100 |
| commit | 2b4e2b8620c3cf5d6bfcf2450de08bd25ca77bfa (patch) | |
| tree | 3c5fad30c3b8f8aa75f7e6175272712d88a8da05 /plugins | |
| parent | 76749e9e8c28633ef73cd5024f4353e4274462e7 (diff) | |
| download | prosody-2b4e2b8620c3cf5d6bfcf2450de08bd25ca77bfa.tar.gz prosody-2b4e2b8620c3cf5d6bfcf2450de08bd25ca77bfa.zip | |
mod_admin_telnet: module:load(): Fix 'global-module-already-loaded' errors when successfully loading a global module (fixes #228)
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/mod_admin_telnet.lua | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua index 412e1e62..cb6302c7 100644 --- a/plugins/mod_admin_telnet.lua +++ b/plugins/mod_admin_telnet.lua @@ -292,16 +292,22 @@ function def_env.module:load(name, hosts, config) hosts = get_hosts_set(hosts); -- Load the module for each host - local ok, err, count = true, nil, 0; + local ok, err, count, mod = true, nil, 0, nil; for host in hosts do if (not mm.is_loaded(host, name)) then - ok, err = mm.load(host, name, config); - if not ok then + mod, err = mm.load(host, name, config); + if not mod then ok = false; + if err == "global-module-already-loaded" then + if count > 0 then + ok, err, count = true, nil, 1; + end + break; + end self.session.print(err or "Unknown error loading module"); else count = count + 1; - self.session.print("Loaded for "..host); + self.session.print("Loaded for "..mod.module.host); end end end |