annotate mod_server_status/mod_server_status.lua @ 6082:1a6cd0bbb7ab

mod_compliance_2023: Add 2023 Version of the compliance module, basis is the 2021 Version. diff --git a/mod_compliance_2023/README.md b/mod_compliance_2023/README.md new file mode 100644 --- /dev/null +++ b/mod_compliance_2023/README.md @@ -0,0 +1,22 @@ +--- +summary: XMPP Compliance Suites 2023 self-test +labels: +- Stage-Beta +rockspec: + dependencies: + - mod_cloud_notify + +... + +Compare the list of enabled modules with +[XEP-0479: XMPP Compliance Suites 2023] and produce basic report to the +Prosody log file. + +If installed with the Prosody plugin installer then all modules needed for a green checkmark should be included. (With prosody 0.12 only [mod_cloud_notify] is not included with prosody and we need the community module) + +# Compatibility + + Prosody-Version Status + --------------- ---------------------- + trunk Works as of 2024-12-21 + 0.12 Works diff --git a/mod_compliance_2023/mod_compliance_2023.lua b/mod_compliance_2023/mod_compliance_2023.lua new file mode 100644 --- /dev/null +++ b/mod_compliance_2023/mod_compliance_2023.lua @@ -0,0 +1,79 @@ +-- Copyright (c) 2021 Kim Alvefur +-- +-- This module is MIT licensed. + +local hostmanager = require "core.hostmanager"; + +local array = require "util.array"; +local set = require "util.set"; + +local modules_enabled = module:get_option_inherited_set("modules_enabled"); + +for host in pairs(hostmanager.get_children(module.host)) do + local component = module:context(host):get_option_string("component_module"); + if component then + modules_enabled:add(component); + modules_enabled:include(module:context(host):get_option_set("modules_enabled", {})); + end +end + +local function check(suggested, alternate, ...) + if set.intersection(modules_enabled, set.new({suggested; alternate; ...})):empty() then return suggested; end + return false; +end + +local compliance = { + array {"Server"; check("tls"); check("disco")}; + + array {"Advanced Server"; check("pep", "pep_simple")}; + + array {"Web"; check("bosh"); check("websocket")}; + + -- No Server requirements for Advanced Web + + array {"IM"; check("vcard_legacy", "vcard"); check("carbons"); check("http_file_share", "http_upload")}; + + array { + "Advanced IM"; + check("vcard_legacy", "vcard"); + check("blocklist"); + check("muc"); + check("private"); + check("smacks"); + check("mam"); + check("bookmarks"); + }; + + array {"Mobile"; check("smacks"); check("csi_simple", "csi_battery_saver")}; + + array {"Advanced Mobile"; check("cloud_notify")}; + + array {"A/V Calling"; check("turn_external", "external_services", "turncredentials", "extdisco")}; + +}; + +function check_compliance() + local compliant = true; + for _, suite in ipairs(compliance) do + local section = suite:pop(1); + if module:get_option_boolean("compliance_" .. section:lower():gsub("%A", "_"), true) then + local missing = set.new(suite:filter(function(m) return type(m) == "string" end):map(function(m) return "mod_" .. m end)); + if suite[1] then + if compliant then + compliant = false; + module:log("warn", "Missing some modules for XMPP Compliance 2023"); + end + module:log("info", "%s Compliance: %s", section, missing); + end + end + end + + if compliant then module:log("info", "XMPP Compliance 2023: Compliant ✔️"); end +end + +if prosody.start_time then + check_compliance() +else + module:hook_global("server-started", check_compliance); +end +
author Menel <menel@snikket.de>
date Sun, 22 Dec 2024 16:06:28 +0100
parents 7dbde05b48a9
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
524
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
1 -- (C) 2011, Marco Cirillo (LW.Org)
541
947103177844 mod_server_status: renamed mod_xml_status to mod_server_status as the option to output the stats in JSON was added.
Marco Cirillo <maranda@lightwitch.org>
parents: 532
diff changeset
2 -- Display server stats in readable XML or JSON format
524
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
3
649
dfd7f1ed7782 mod_server_status: updated to current HTTP API.
Marco Cirillo <maranda@lightwitch.org>
parents: 609
diff changeset
4 module:depends("http")
524
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
5
656
74bd7ebe5792 mod_server_status: fix code typo, get_option_array was used instead of get_option_string
Marco Cirillo <maranda@lightwitch.org>
parents: 649
diff changeset
6 local base_path = module:get_option_string("server_status_basepath", "/server-status/")
541
947103177844 mod_server_status: renamed mod_xml_status to mod_server_status as the option to output the stats in JSON was added.
Marco Cirillo <maranda@lightwitch.org>
parents: 532
diff changeset
7 local show_hosts = module:get_option_array("server_status_show_hosts", nil)
947103177844 mod_server_status: renamed mod_xml_status to mod_server_status as the option to output the stats in JSON was added.
Marco Cirillo <maranda@lightwitch.org>
parents: 532
diff changeset
8 local show_comps = module:get_option_array("server_status_show_comps", nil)
947103177844 mod_server_status: renamed mod_xml_status to mod_server_status as the option to output the stats in JSON was added.
Marco Cirillo <maranda@lightwitch.org>
parents: 532
diff changeset
9 local json_output = module:get_option_boolean("server_status_json", false)
524
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
10
541
947103177844 mod_server_status: renamed mod_xml_status to mod_server_status as the option to output the stats in JSON was added.
Marco Cirillo <maranda@lightwitch.org>
parents: 532
diff changeset
11 local json_encode = require "util.json".encode
524
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
12
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
13 -- code begin
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
14
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
15 if not prosody.stanza_counter and not show_hosts and not show_comps then
541
947103177844 mod_server_status: renamed mod_xml_status to mod_server_status as the option to output the stats in JSON was added.
Marco Cirillo <maranda@lightwitch.org>
parents: 532
diff changeset
16 module:log ("error", "mod_server_status requires at least one of the following things:")
947103177844 mod_server_status: renamed mod_xml_status to mod_server_status as the option to output the stats in JSON was added.
Marco Cirillo <maranda@lightwitch.org>
parents: 532
diff changeset
17 module:log ("error", "mod_stanza_counter loaded, or either server_status_show_hosts or server_status_show_comps configuration values set.")
947103177844 mod_server_status: renamed mod_xml_status to mod_server_status as the option to output the stats in JSON was added.
Marco Cirillo <maranda@lightwitch.org>
parents: 532
diff changeset
18 module:log ("error", "check the module wiki at: http://code.google.com/p/prosody-modules/wiki/mod_server_status")
524
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
19 return false
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
20 end
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
21
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
22 local response_table = {}
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
23 response_table.header = '<?xml version="1.0" encoding="UTF-8" ?>'
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
24 response_table.doc_header = '<document>'
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
25 response_table.doc_closure = '</document>'
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
26 response_table.stanzas = {
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
27 elem_header = ' <stanzas>', elem_closure = ' </stanzas>',
1343
7dbde05b48a9 all the things: Remove trailing whitespace
Florian Zeitz <florob@babelmonkeys.de>
parents: 658
diff changeset
28 incoming = ' <incoming iq="%d" message="%d" presence="%d" />',
524
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
29 outgoing = ' <outgoing iq="%d" message="%d" presence="%d" />'
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
30 }
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
31 response_table.hosts = {
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
32 elem_header = ' <hosts>', elem_closure = ' </hosts>',
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
33 status = ' <status name="%s" current="%s" />'
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
34 }
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
35 response_table.comps = {
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
36 elem_header = ' <components>', elem_closure = ' </components>',
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
37 status = ' <status name="%s" current="%s" />'
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
38 }
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
39
541
947103177844 mod_server_status: renamed mod_xml_status to mod_server_status as the option to output the stats in JSON was added.
Marco Cirillo <maranda@lightwitch.org>
parents: 532
diff changeset
40 local function forge_response_xml()
524
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
41 local hosts_s = {}; local components = {}; local stats = {}; local hosts_stats = {}; local comps_stats = {}
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
42
526
0529658efd1e mod_xml_status: last code cleanup and optimization.
Marco Cirillo <maranda@lightwitch.org>
parents: 525
diff changeset
43 local function t_builder(t,r) for _, bstring in ipairs(t) do r[#r+1] = bstring end end
0529658efd1e mod_xml_status: last code cleanup and optimization.
Marco Cirillo <maranda@lightwitch.org>
parents: 525
diff changeset
44
0529658efd1e mod_xml_status: last code cleanup and optimization.
Marco Cirillo <maranda@lightwitch.org>
parents: 525
diff changeset
45 if show_hosts then t_builder(show_hosts, hosts_s) end
0529658efd1e mod_xml_status: last code cleanup and optimization.
Marco Cirillo <maranda@lightwitch.org>
parents: 525
diff changeset
46 if show_comps then t_builder(show_comps, components) end
1343
7dbde05b48a9 all the things: Remove trailing whitespace
Florian Zeitz <florob@babelmonkeys.de>
parents: 658
diff changeset
47
524
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
48 -- build stanza stats if there
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
49 if prosody.stanza_counter then
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
50 stats[1] = response_table.stanzas.elem_header
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
51 stats[2] = response_table.stanzas.incoming:format(prosody.stanza_counter.iq["incoming"],
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
52 prosody.stanza_counter.message["incoming"],
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
53 prosody.stanza_counter.presence["incoming"])
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
54 stats[3] = response_table.stanzas.outgoing:format(prosody.stanza_counter.iq["outgoing"],
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
55 prosody.stanza_counter.message["outgoing"],
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
56 prosody.stanza_counter.presence["outgoing"])
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
57 stats[4] = response_table.stanzas.elem_closure
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
58 end
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
59
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
60 -- build hosts stats if there
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
61 if hosts_s[1] then
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
62 hosts_stats[1] = response_table.hosts.elem_header
1343
7dbde05b48a9 all the things: Remove trailing whitespace
Florian Zeitz <florob@babelmonkeys.de>
parents: 658
diff changeset
63 for _, name in ipairs(hosts_s) do
524
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
64 hosts_stats[#hosts_stats+1] = response_table.hosts.status:format(
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
65 name, hosts[name] and "online" or "offline")
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
66 end
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
67 hosts_stats[#hosts_stats+1] = response_table.hosts.elem_closure
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
68 end
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
69
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
70 -- build components stats if there
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
71 if components[1] then
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
72 comps_stats[1] = response_table.comps.elem_header
1343
7dbde05b48a9 all the things: Remove trailing whitespace
Florian Zeitz <florob@babelmonkeys.de>
parents: 658
diff changeset
73 for _, name in ipairs(components) do
524
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
74 comps_stats[#comps_stats+1] = response_table.comps.status:format(
1343
7dbde05b48a9 all the things: Remove trailing whitespace
Florian Zeitz <florob@babelmonkeys.de>
parents: 658
diff changeset
75 name, hosts[name] and hosts[name].modules.component and hosts[name].modules.component.connected and "online" or
524
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
76 hosts[name] and hosts[name].modules.component == nil and "online" or "offline")
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
77 end
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
78 comps_stats[#comps_stats+1] = response_table.comps.elem_closure
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
79 end
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
80
526
0529658efd1e mod_xml_status: last code cleanup and optimization.
Marco Cirillo <maranda@lightwitch.org>
parents: 525
diff changeset
81 -- build xml document
0529658efd1e mod_xml_status: last code cleanup and optimization.
Marco Cirillo <maranda@lightwitch.org>
parents: 525
diff changeset
82 local result = {}
0529658efd1e mod_xml_status: last code cleanup and optimization.
Marco Cirillo <maranda@lightwitch.org>
parents: 525
diff changeset
83 result[#result+1] = response_table.header; result[#result+1] = response_table.doc_header -- start
0529658efd1e mod_xml_status: last code cleanup and optimization.
Marco Cirillo <maranda@lightwitch.org>
parents: 525
diff changeset
84 t_builder(stats, result); t_builder(hosts_stats, result); t_builder(comps_stats, result)
0529658efd1e mod_xml_status: last code cleanup and optimization.
Marco Cirillo <maranda@lightwitch.org>
parents: 525
diff changeset
85 result[#result+1] = response_table.doc_closure -- end
541
947103177844 mod_server_status: renamed mod_xml_status to mod_server_status as the option to output the stats in JSON was added.
Marco Cirillo <maranda@lightwitch.org>
parents: 532
diff changeset
86
524
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
87 return table.concat(result, "\n")
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
88 end
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
89
541
947103177844 mod_server_status: renamed mod_xml_status to mod_server_status as the option to output the stats in JSON was added.
Marco Cirillo <maranda@lightwitch.org>
parents: 532
diff changeset
90 local function forge_response_json()
947103177844 mod_server_status: renamed mod_xml_status to mod_server_status as the option to output the stats in JSON was added.
Marco Cirillo <maranda@lightwitch.org>
parents: 532
diff changeset
91 local result = {}
947103177844 mod_server_status: renamed mod_xml_status to mod_server_status as the option to output the stats in JSON was added.
Marco Cirillo <maranda@lightwitch.org>
parents: 532
diff changeset
92
947103177844 mod_server_status: renamed mod_xml_status to mod_server_status as the option to output the stats in JSON was added.
Marco Cirillo <maranda@lightwitch.org>
parents: 532
diff changeset
93 if prosody.stanza_counter then result.stanzas = {} ; result.stanzas = prosody.stanza_counter end
947103177844 mod_server_status: renamed mod_xml_status to mod_server_status as the option to output the stats in JSON was added.
Marco Cirillo <maranda@lightwitch.org>
parents: 532
diff changeset
94 if show_hosts then
947103177844 mod_server_status: renamed mod_xml_status to mod_server_status as the option to output the stats in JSON was added.
Marco Cirillo <maranda@lightwitch.org>
parents: 532
diff changeset
95 result.hosts = {}
544
f78a95aa23c4 mod_server_status: corrected mistake in the code.
Marco Cirillo <maranda@lightwitch.org>
parents: 543
diff changeset
96 for _,n in ipairs(show_hosts) do result.hosts[n] = hosts[n] and "online" or "offline" end
541
947103177844 mod_server_status: renamed mod_xml_status to mod_server_status as the option to output the stats in JSON was added.
Marco Cirillo <maranda@lightwitch.org>
parents: 532
diff changeset
97 end
947103177844 mod_server_status: renamed mod_xml_status to mod_server_status as the option to output the stats in JSON was added.
Marco Cirillo <maranda@lightwitch.org>
parents: 532
diff changeset
98 if show_comps then
542
32d9fd110cb1 mod_server_status: corrected error.
Marco Cirillo <maranda@lightwitch.org>
parents: 541
diff changeset
99 result.components = {}
1343
7dbde05b48a9 all the things: Remove trailing whitespace
Florian Zeitz <florob@babelmonkeys.de>
parents: 658
diff changeset
100 for _,n in ipairs(show_comps) do
546
0afe88f9bdde mod_server_status: fixed trace case when an user, mistakenly or not, sets a component which doesn't exist into the plugin config. (thanks chris)
Marco Cirillo <maranda@lightwitch.org>
parents: 544
diff changeset
101 result.components[n] = hosts[n] and hosts[n].modules.component and hosts[n].modules.component.connected and "online" or
544
f78a95aa23c4 mod_server_status: corrected mistake in the code.
Marco Cirillo <maranda@lightwitch.org>
parents: 543
diff changeset
102 hosts[n] and hosts[n].modules.component == nil and "online" or "offline"
541
947103177844 mod_server_status: renamed mod_xml_status to mod_server_status as the option to output the stats in JSON was added.
Marco Cirillo <maranda@lightwitch.org>
parents: 532
diff changeset
103 end
947103177844 mod_server_status: renamed mod_xml_status to mod_server_status as the option to output the stats in JSON was added.
Marco Cirillo <maranda@lightwitch.org>
parents: 532
diff changeset
104 end
947103177844 mod_server_status: renamed mod_xml_status to mod_server_status as the option to output the stats in JSON was added.
Marco Cirillo <maranda@lightwitch.org>
parents: 532
diff changeset
105
947103177844 mod_server_status: renamed mod_xml_status to mod_server_status as the option to output the stats in JSON was added.
Marco Cirillo <maranda@lightwitch.org>
parents: 532
diff changeset
106 return json_encode(result)
947103177844 mod_server_status: renamed mod_xml_status to mod_server_status as the option to output the stats in JSON was added.
Marco Cirillo <maranda@lightwitch.org>
parents: 532
diff changeset
107 end
947103177844 mod_server_status: renamed mod_xml_status to mod_server_status as the option to output the stats in JSON was added.
Marco Cirillo <maranda@lightwitch.org>
parents: 532
diff changeset
108
524
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
109 -- http handlers
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
110
649
dfd7f1ed7782 mod_server_status: updated to current HTTP API.
Marco Cirillo <maranda@lightwitch.org>
parents: 609
diff changeset
111 local function request(event)
dfd7f1ed7782 mod_server_status: updated to current HTTP API.
Marco Cirillo <maranda@lightwitch.org>
parents: 609
diff changeset
112 local response = event.response
dfd7f1ed7782 mod_server_status: updated to current HTTP API.
Marco Cirillo <maranda@lightwitch.org>
parents: 609
diff changeset
113 if not json_output then
657
26e61a9afb5c mod_server_status: for sure xml isn't json, passing json mime and viceversa isn't appropriate at all. *no no*
Marco Cirillo <maranda@lightwitch.org>
parents: 656
diff changeset
114 response.headers.content_type = "text/xml"
1343
7dbde05b48a9 all the things: Remove trailing whitespace
Florian Zeitz <florob@babelmonkeys.de>
parents: 658
diff changeset
115 response:send(forge_response_xml())
524
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
116 else
657
26e61a9afb5c mod_server_status: for sure xml isn't json, passing json mime and viceversa isn't appropriate at all. *no no*
Marco Cirillo <maranda@lightwitch.org>
parents: 656
diff changeset
117 response.headers.content_type = "application/json"
649
dfd7f1ed7782 mod_server_status: updated to current HTTP API.
Marco Cirillo <maranda@lightwitch.org>
parents: 609
diff changeset
118 response:send(forge_response_json())
524
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
119 end
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
120 end
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
121
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
122 -- initialization.
ff3ea8735d61 mod_xml_status: initial commit. Expose server status in xml format to be used on external webapps.
Marco Cirillo <maranda@lightwitch.org>
parents:
diff changeset
123
649
dfd7f1ed7782 mod_server_status: updated to current HTTP API.
Marco Cirillo <maranda@lightwitch.org>
parents: 609
diff changeset
124 module:provides("http", {
dfd7f1ed7782 mod_server_status: updated to current HTTP API.
Marco Cirillo <maranda@lightwitch.org>
parents: 609
diff changeset
125 default_path = base_path,
dfd7f1ed7782 mod_server_status: updated to current HTTP API.
Marco Cirillo <maranda@lightwitch.org>
parents: 609
diff changeset
126 route = {
dfd7f1ed7782 mod_server_status: updated to current HTTP API.
Marco Cirillo <maranda@lightwitch.org>
parents: 609
diff changeset
127 ["GET /"] = request
dfd7f1ed7782 mod_server_status: updated to current HTTP API.
Marco Cirillo <maranda@lightwitch.org>
parents: 609
diff changeset
128 }
dfd7f1ed7782 mod_server_status: updated to current HTTP API.
Marco Cirillo <maranda@lightwitch.org>
parents: 609
diff changeset
129 })
dfd7f1ed7782 mod_server_status: updated to current HTTP API.
Marco Cirillo <maranda@lightwitch.org>
parents: 609
diff changeset
130