From 34eaa793cedfdd14b61e104d2d95455c0475c0dc Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Thu, 9 Dec 2010 22:17:28 +0500 Subject: mod_console: Removed redundant code for host:activate() and host:deactivate(), now that hostmanager has error checking. --- plugins/mod_console.lua | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-) (limited to 'plugins') diff --git a/plugins/mod_console.lua b/plugins/mod_console.lua index 64e420e2..0b2dd5f8 100644 --- a/plugins/mod_console.lua +++ b/plugins/mod_console.lua @@ -708,31 +708,12 @@ function def_env.s2s:close(from, to) end def_env.host = {}; def_env.hosts = def_env.host; + function def_env.host:activate(hostname, config) - local hostmanager_activate = require "core.hostmanager".activate; - if hosts[hostname] then - return false, "The host "..tostring(hostname).." is already activated"; - end - - local defined_hosts = config or configmanager.getconfig(); - if not config and not defined_hosts[hostname] then - return false, "Couldn't find "..tostring(hostname).." defined in the config, perhaps you need to config:reload()?"; - end - hostmanager_activate(hostname, config or defined_hosts[hostname]); - return true, "Host "..tostring(hostname).." activated"; + return hostmanager.activate(hostname, config); end - function def_env.host:deactivate(hostname, reason) - local hostmanager_deactivate = require "core.hostmanager".deactivate; - local host = hosts[hostname]; - if not host then - return false, "The host "..tostring(hostname).." is not activated"; - end - if reason then - reason = { condition = "host-gone", text = reason }; - end - hostmanager_deactivate(hostname, reason); - return true, "Host "..tostring(hostname).." deactivated"; + return hostmanager.deactivate(hostname, reason); end function def_env.host:list() -- cgit v1.2.3