Mercurial > prosody-modules

changeset 541:947103177844

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mod_server_status: renamed mod_xml_status to mod_server_status as the option to output the stats in JSON was added.
author Marco Cirillo <maranda@lightwitch.org>
date Tue, 10 Jan 2012 19:36:28 +0000
parents 31c29832ef3e
children 32d9fd110cb1
files mod_server_status/mod_server_status.lua mod_xml_status/mod_xml_status.lua
diffstat 2 files changed, 140 insertions(+), 119 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mod_server_status/mod_server_status.lua	Tue Jan 10 19:36:28 2012 +0000
@@ -0,0 +1,140 @@
+-- (C) 2011, Marco Cirillo (LW.Org)
+-- Display server stats in readable XML or JSON format
+
+module:set_global()
+
+local ports = module:get_option_array("server_status_http_ports", {{ port = 5280 }})
+local show_hosts = module:get_option_array("server_status_show_hosts", nil)
+local show_comps = module:get_option_array("server_status_show_comps", nil)
+local json_output = module:get_option_boolean("server_status_json", false)
+
+local httpserver = require "net.httpserver"
+local json_encode = require "util.json".encode
+
+-- code begin
+
+if not prosody.stanza_counter and not show_hosts and not show_comps then
+	module:log ("error", "mod_server_status requires at least one of the following things:")
+	module:log ("error", "mod_stanza_counter loaded, or either server_status_show_hosts or server_status_show_comps configuration values set.")
+	module:log ("error", "check the module wiki at: http://code.google.com/p/prosody-modules/wiki/mod_server_status")
+	return false
+end
+
+local r_err = "\n<html>\n<head>\n<title>Prosody's Server Status - Error %s</title>\n<meta name=\"robots\" content=\"noindex, nofollow\" />\n</head>\n\n<body>\n<h3>%s</h3>\n</body>\n\n</html>\n"
+
+local response_table = {}
+response_table.header = '<?xml version="1.0" encoding="UTF-8" ?>'
+response_table.doc_header = '<document>'
+response_table.doc_closure = '</document>'
+response_table.stanzas = {
+		elem_header = '  <stanzas>', elem_closure = '  </stanzas>',
+		incoming = '    <incoming iq="%d" message="%d" presence="%d" />', 
+		outgoing = '    <outgoing iq="%d" message="%d" presence="%d" />'
+}
+response_table.hosts = {
+		elem_header = '  <hosts>', elem_closure = '  </hosts>',
+		status = '    <status name="%s" current="%s" />'
+}
+response_table.comps = {
+		elem_header = '  <components>', elem_closure = '  </components>',
+		status = '    <status name="%s" current="%s" />'
+}
+
+local function forge_response_xml()
+	local hosts_s = {}; local components = {}; local stats = {}; local hosts_stats = {}; local comps_stats = {}
+
+	local function t_builder(t,r) for _, bstring in ipairs(t) do r[#r+1] = bstring end end
+
+	if show_hosts then t_builder(show_hosts, hosts_s) end
+	if show_comps then t_builder(show_comps, components) end
+	
+	-- build stanza stats if there
+	if prosody.stanza_counter then
+		stats[1] = response_table.stanzas.elem_header
+		stats[2] = response_table.stanzas.incoming:format(prosody.stanza_counter.iq["incoming"],
+								  prosody.stanza_counter.message["incoming"],
+								  prosody.stanza_counter.presence["incoming"])
+		stats[3] = response_table.stanzas.outgoing:format(prosody.stanza_counter.iq["outgoing"],
+								  prosody.stanza_counter.message["outgoing"],
+								  prosody.stanza_counter.presence["outgoing"])
+		stats[4] = response_table.stanzas.elem_closure
+	end
+
+	-- build hosts stats if there
+	if hosts_s[1] then
+		hosts_stats[1] = response_table.hosts.elem_header
+		for _, name in ipairs(hosts_s) do 
+			hosts_stats[#hosts_stats+1] = response_table.hosts.status:format(
+				name, hosts[name] and "online" or "offline")
+		end
+		hosts_stats[#hosts_stats+1] = response_table.hosts.elem_closure
+	end
+
+	-- build components stats if there
+	if components[1] then
+		comps_stats[1] = response_table.comps.elem_header
+		for _, name in ipairs(components) do 
+			comps_stats[#comps_stats+1] = response_table.comps.status:format(
+				name, hosts[name].modules.component and hosts[name].modules.component.connected and "online" or 
+				hosts[name] and hosts[name].modules.component == nil and "online" or "offline")
+		end
+		comps_stats[#comps_stats+1] = response_table.comps.elem_closure
+	end
+
+	-- build xml document
+	local result = {}
+	result[#result+1] = response_table.header; result[#result+1] = response_table.doc_header -- start
+	t_builder(stats, result); t_builder(hosts_stats, result); t_builder(comps_stats, result)
+	result[#result+1] = response_table.doc_closure -- end
+
+	return table.concat(result, "\n")
+end
+
+local function forge_response_json()
+	local result = {}
+
+	if prosody.stanza_counter then result.stanzas = {} ; result.stanzas = prosody.stanza_counter  end
+	if show_hosts then
+		result.hosts = {}
+		for _,n in ipairs(show_hosts) do result.hosts[n] = hosts[name] and "online" or "offline" end
+	end
+	if show_comps then
+		result.comps = {}
+		for _,n in ipairs(show_hosts) do 
+			result.comps[n] =  hosts[name].modules.component and hosts[name].modules.component.connected and "online" or
+			hosts[name] and hosts[name].modules.component == nil and "online" or "offline"
+		end
+	end
+
+	return json_encode(result)
+end
+
+-- http handlers
+
+local function response(code, r, h)
+	local response = { status = code, body = r }
+	
+        if h then response.headers = h end
+        return response
+end
+
+local function request(method, body, request)
+	if method == "GET" then
+		if not json_output then return response(200, forge_response_xml()) else return response(200, forge_response_json()) end
+	else
+		local err405 = r_err:format("405", "Only GET is supported")
+		return response(405, err405, {["Allow"] = "GET"})
+	end
+end
+
+-- initialization.
+-- init http interface
+local function setup()
+	httpserver.new_from_config(ports, request, { base = "server-status" })
+end
+
+if prosody.start_time then
+        setup()
+else
+        module:hook("server-started", setup)
+end
--- a/mod_xml_status/mod_xml_status.lua	Tue Jan 10 19:23:04 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,119 +0,0 @@
--- (C) 2011, Marco Cirillo (LW.Org)
--- Display server stats in readable XML format
-
-module:set_global()
-
-local ports = module:get_option_array("xml_status_http_ports", {{ port = 5280 }})
-local show_hosts = module:get_option_array("xml_status_show_hosts", nil)
-local show_comps = module:get_option_array("xml_status_show_comps", nil)
-
-local httpserver = require "net.httpserver"
-
--- code begin
-
-if not prosody.stanza_counter and not show_hosts and not show_comps then
-	module:log ("error", "mod_xml_status requires at least one of the following things:")
-	module:log ("error", "mod_stanza_counter loaded, or either xml_status_show_hosts or xml_status_show_comps configuration values set.")
-	module:log ("error", "check the module wiki at: http://code.google.com/p/prosody-modules/wiki/mod_xml_status")
-	return false
-end
-
-local r_err = "\n<html>\n<head>\n<title>Prosody's XML Status - Error %s</title>\n<meta name=\"robots\" content=\"noindex, nofollow\" />\n</head>\n\n<body>\n<h3>%s</h3>\n</body>\n\n</html>\n"
-
-local response_table = {}
-response_table.header = '<?xml version="1.0" encoding="UTF-8" ?>'
-response_table.doc_header = '<document>'
-response_table.doc_closure = '</document>'
-response_table.stanzas = {
-		elem_header = '  <stanzas>', elem_closure = '  </stanzas>',
-		incoming = '    <incoming iq="%d" message="%d" presence="%d" />', 
-		outgoing = '    <outgoing iq="%d" message="%d" presence="%d" />'
-}
-response_table.hosts = {
-		elem_header = '  <hosts>', elem_closure = '  </hosts>',
-		status = '    <status name="%s" current="%s" />'
-}
-response_table.comps = {
-		elem_header = '  <components>', elem_closure = '  </components>',
-		status = '    <status name="%s" current="%s" />'
-}
-
-local function forge_response()
-	local hosts_s = {}; local components = {}; local stats = {}; local hosts_stats = {}; local comps_stats = {}
-
-	local function t_builder(t,r) for _, bstring in ipairs(t) do r[#r+1] = bstring end end
-
-	if show_hosts then t_builder(show_hosts, hosts_s) end
-	if show_comps then t_builder(show_comps, components) end
-	
-	-- build stanza stats if there
-	if prosody.stanza_counter then
-		stats[1] = response_table.stanzas.elem_header
-		stats[2] = response_table.stanzas.incoming:format(prosody.stanza_counter.iq["incoming"],
-								  prosody.stanza_counter.message["incoming"],
-								  prosody.stanza_counter.presence["incoming"])
-		stats[3] = response_table.stanzas.outgoing:format(prosody.stanza_counter.iq["outgoing"],
-								  prosody.stanza_counter.message["outgoing"],
-								  prosody.stanza_counter.presence["outgoing"])
-		stats[4] = response_table.stanzas.elem_closure
-	end
-
-	-- build hosts stats if there
-	if hosts_s[1] then
-		hosts_stats[1] = response_table.hosts.elem_header
-		for _, name in ipairs(hosts_s) do 
-			hosts_stats[#hosts_stats+1] = response_table.hosts.status:format(
-				name, hosts[name] and "online" or "offline")
-		end
-		hosts_stats[#hosts_stats+1] = response_table.hosts.elem_closure
-	end
-
-	-- build components stats if there
-	if components[1] then
-		comps_stats[1] = response_table.comps.elem_header
-		for _, name in ipairs(components) do 
-			comps_stats[#comps_stats+1] = response_table.comps.status:format(
-				name, hosts[name].modules.component and hosts[name].modules.component.connected and "online" or 
-				hosts[name] and hosts[name].modules.component == nil and "online" or "offline")
-		end
-		comps_stats[#comps_stats+1] = response_table.comps.elem_closure
-	end
-
-	-- build xml document
-	local result = {}
-	result[#result+1] = response_table.header; result[#result+1] = response_table.doc_header -- start
-	t_builder(stats, result); t_builder(hosts_stats, result); t_builder(comps_stats, result)
-	result[#result+1] = response_table.doc_closure -- end
-	
-	return table.concat(result, "\n")
-end
-
--- http handlers
-
-local function response(code, r, h)
-	local response = { status = code, body = r }
-	
-        if h then response.headers = h end
-        return response
-end
-
-local function request(method, body, request)
-	if method == "GET" then
-		return response(200, forge_response())
-	else
-		local err405 = r_err:format("405", "Only GET is supported")
-		return response(405, err405, {["Allow"] = "GET"})
-	end
-end
-
--- initialization.
--- init http interface
-local function setup()
-	httpserver.new_from_config(ports, request, { base = "xml-status" })
-end
-
-if prosody.start_time then
-        setup()
-else
-        module:hook("server-started", setup)
-end