Comparison

mod_console: Removed redundant code for host:activate() and host:deactivate(), now that hostmanager has error checking.

author	Waqas Hussain <waqas20@gmail.com>
date	Thu, 09 Dec 2010 22:17:28 +0500
parent	3614:8b436cc88c0e

comparison

equal deleted inserted replaced

-:f408d586de9a
+:abcbce5e4240
 	return true, "Closed "..count.." s2s session"..((count == 1 and "") or "s");
 end
 def_env.host = {}; def_env.hosts = def_env.host;
 function def_env.host:activate(hostname, config)
-	local hostmanager_activate = require "core.hostmanager".activate;
+	return hostmanager.activate(hostname, config);
-	if hosts[hostname] then
+end
-		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";
-end
 function def_env.host:deactivate(hostname, reason)
-	local hostmanager_deactivate = require "core.hostmanager".deactivate;
+	return hostmanager.deactivate(hostname, reason);
-	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";
 end
 function def_env.host:list()
 	local print = self.session.print;
 	local i = 0;