X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_admin_telnet.lua;h=aa7b10cb9c37b02d7862d319216e9c79624f91ef;hb=add8d81b2a58169821e0f668a45da6f743433d70;hp=6a5f87d41f49f6c18ac70498ed15172fef0e3c1f;hpb=b6d336cbfe79bf837dbf89f80d4852aa58a110c4;p=prosody.git

diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index 6a5f87d4..aa7b10cb 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -282,6 +282,8 @@ end
 -- Session environment --
 -- Anything in def_env will be accessible within the session as a global variable
 
+--luacheck: ignore 212/self
+
 def_env.server = {};
 
 function def_env.server:insane_reload()
@@ -334,6 +336,38 @@ function def_env.server:memory()
 	return true, "OK";
 end
 
+def_env.timer = {};
+
+function def_env.timer:info()
+	local print = self.session.print;
+	local add_task = require"util.timer".add_task;
+	local h, params = add_task.h, add_task.params;
+	print("-- util.timer");
+	for i, id in ipairs(h.ids) do
+		if not params[id] then
+			print(os.date("%F %T", h.priorities[i]), h.items[id]);
+		elseif not params[id].callback then
+			print(os.date("%F %T", h.priorities[i]), h.items[id], unpack(params[id]));
+		else
+			print(os.date("%F %T", h.priorities[i]), params[id].callback, unpack(params[id]));
+		end
+	end
+	if server.event_base then
+		local count = 0;
+		for k, v in pairs(debug.getregistry()) do
+			if type(v) == "function" and v.callback == add_task._on_timer then
+				count = count + 1;
+			end
+		end
+		print(count .. " libevent callbacks");
+	end
+	local next_time = h:peek();
+	if next_time then
+		return true, os.date("Next event at %F %T", next_time);
+	end
+	return true;
+end
+
 def_env.module = {};
 
 local function get_hosts_set(hosts, module)
@@ -512,6 +546,9 @@ local function session_flags(session, line)
 	if session.ip and session.ip:match(":") then
 		line[#line+1] = "(IPv6)";
 	end
+	if session.remote then
+		line[#line+1] = "(remote)";
+	end
 	return table.concat(line, " ");
 end
 
@@ -955,7 +992,7 @@ function def_env.muc:room(room_jid)
 	if not room_name then
 		return room_name, host;
 	end
-	local room_obj = hosts[host].modules.muc.rooms[room_jid];
+	local room_obj = hosts[host].modules.muc.get_room_from_jid(room_jid);
 	if not room_obj then
 		return nil, "No such room: "..room_jid;
 	end
@@ -969,8 +1006,8 @@ function def_env.muc:list(host)
 	end
 	local print = self.session.print;
 	local c = 0;
-	for name in keys(host_session.modules.muc.rooms) do
-		print(name);
+	for room in host_session.modules.muc.each_room() do
+		print(room.jid);
 		c = c + 1;
 	end
 	return true, c.." rooms";
@@ -1090,6 +1127,33 @@ function def_env.dns:cache()
 	return true, "Cache:\n"..tostring(dns.cache())
 end
 
+def_env.http = {};
+
+function def_env.http:list()
+	local print = self.session.print;
+
+	for host in pairs(prosody.hosts) do
+		local http_apps = modulemanager.get_items("http-provider", host);
+		if #http_apps > 0 then
+			local http_host = module:context(host):get_option("http_host");
+			print("HTTP endpoints on "..host..(http_host and (" (using "..http_host.."):") or ":"));
+			for _, provider in ipairs(http_apps) do
+				local url = module:context(host):http_url(provider.name);
+				print("", url);
+			end
+			print("");
+		end
+	end
+
+	local default_host = module:get_option("http_default_host");
+	if not default_host then
+		print("HTTP requests to unknown hosts will return 404 Not Found");
+	else
+		print("HTTP requests to unknown hosts will be handled by "..default_host);
+	end
+	return true;
+end
+
 -------------
 
 function printbanner(session)