Mercurial > prosody-hg
annotate tools/cfgdump.lua @ 13652:a08065207ef0
net.server_epoll: Call :shutdown() on TLS sockets when supported
Comment from Matthew:
This fixes a potential issue where the Prosody process gets blocked on sockets
waiting for them to close. Unlike non-TLS sockets, closing a TLS socket sends
layer 7 data, and this can cause problems for sockets which are in the process
of being cleaned up.
This depends on LuaSec changes which are not yet upstream.
From Martijn's original email:
So first my analysis of luasec. in ssl.c the socket is put into blocking
mode right before calling SSL_shutdown() inside meth_destroy(). My best
guess to why this is is because meth_destroy is linked to the __close
and __gc methods, which can't exactly be called multiple times and
luasec does want to make sure that a tls session is shutdown as clean
as possible.
I can't say I disagree with this reasoning and don't want to change this
behaviour. My solution to this without changing the current behaviour is
to introduce a shutdown() method. I am aware that this overlaps in a
conflicting way with tcp's shutdown method, but it stays close to the
OpenSSL name. This method calls SSL_shutdown() in the current
(non)blocking mode of the underlying socket and returns a boolean
whether or not the shutdown is completed (matching SSL_shutdown()'s 0
or 1 return values), and returns the familiar ssl_ioerror() strings on
error with a false for completion. This error can then be used to
determine if we have wantread/wantwrite to finalize things. Once
meth_shutdown() has been called once a shutdown flag will be set, which
indicates to meth_destroy() that the SSL_shutdown() has been handled
by the application and it shouldn't be needed to set the socket to
blocking mode. I've left the SSL_shutdown() call in the
LSEC_STATE_CONNECTED to prevent TOCTOU if the application reaches a
timeout for the shutdown code, which might allow SSL_shutdown() to
clean up anyway at the last possible moment.
Another thing I've changed to luasec is the call to socket_setblocking()
right before calling close(2) in socket_destroy() in usocket.c.
According to the latest POSIX[0]:
Note that the requirement for close() on a socket to block for up to
the current linger interval is not conditional on the O_NONBLOCK
setting.
Which I read to mean that removing O_NONBLOCK on the socket before close
doesn't impact the behaviour and only causes noise in system call
tracers. I didn't touch the windows bits of this, since I don't do
windows.
For the prosody side of things I've made the TLS shutdown bits resemble
interface:onwritable(), and put it under a combined guard of self._tls
and self.conn.shutdown. The self._tls bit is there to prevent getting
stuck on this condition, and self.conn.shutdown is there to prevent the
code being called by instances where the patched luasec isn't deployed.
The destroy() method can be called from various places and is read by
me as the "we give up" error path. To accommodate for these unexpected
entrypoints I've added a single call to self.conn:shutdown() to prevent
the socket being put into blocking mode. I have no expectations that
there is any other use here. Same as previous, the self.conn.shutdown
check is there to make sure it's not called on unpatched luasec
deployments and self._tls is there to make sure we don't call shutdown()
on tcp sockets.
I wouldn't recommend logging of the conn:shutdown() error inside
close(), since a lot of clients simply close the connection before
SSL_shutdown() is done.
| author | Martijn van Duren <martijn@openbsd.org> |
|---|---|
| date | Thu, 06 Feb 2025 15:04:38 +0000 |
| parents | 879a6a33c21b |
| children |
| rev | line source |
|---|---|
|
11192
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
1 #!/usr/bin/env lua |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
2 |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
3 -- cfgdump.lua prosody.cfg.lua [[host] option] |
|
13142
879a6a33c21b
tools: Update imports to use new prosody.* namespace
Kim Alvefur <zash@zash.se>
parents:
11570
diff
changeset
|
4 if not pcall(require, "prosody.loader") then |
|
879a6a33c21b
tools: Update imports to use new prosody.* namespace
Kim Alvefur <zash@zash.se>
parents:
11570
diff
changeset
|
5 pcall(require, "loader"); |
|
879a6a33c21b
tools: Update imports to use new prosody.* namespace
Kim Alvefur <zash@zash.se>
parents:
11570
diff
changeset
|
6 end |
|
11192
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
7 |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
8 local s_format, print = string.format, print; |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
9 local printf = function(fmt, ...) return print(s_format(fmt, ...)); end |
|
13142
879a6a33c21b
tools: Update imports to use new prosody.* namespace
Kim Alvefur <zash@zash.se>
parents:
11570
diff
changeset
|
10 local it = require "prosody.util.iterators"; |
|
11570
c3896c714a83
tools/cfgdump: Serialize individual (table) settings in stable order too
Kim Alvefur <zash@zash.se>
parents:
11569
diff
changeset
|
11 local function sort_anything(a, b) |
|
c3896c714a83
tools/cfgdump: Serialize individual (table) settings in stable order too
Kim Alvefur <zash@zash.se>
parents:
11569
diff
changeset
|
12 local typeof_a, typeof_b = type(a), type(b); |
|
c3896c714a83
tools/cfgdump: Serialize individual (table) settings in stable order too
Kim Alvefur <zash@zash.se>
parents:
11569
diff
changeset
|
13 if typeof_a ~= typeof_b then return typeof_a < typeof_b end |
|
c3896c714a83
tools/cfgdump: Serialize individual (table) settings in stable order too
Kim Alvefur <zash@zash.se>
parents:
11569
diff
changeset
|
14 return a < b -- should work for everything in a config file |
|
c3896c714a83
tools/cfgdump: Serialize individual (table) settings in stable order too
Kim Alvefur <zash@zash.se>
parents:
11569
diff
changeset
|
15 end |
|
13142
879a6a33c21b
tools: Update imports to use new prosody.* namespace
Kim Alvefur <zash@zash.se>
parents:
11570
diff
changeset
|
16 local serialization = require "prosody.util.serialization"; |
|
11570
c3896c714a83
tools/cfgdump: Serialize individual (table) settings in stable order too
Kim Alvefur <zash@zash.se>
parents:
11569
diff
changeset
|
17 local serialize = serialization.new and serialization.new({ |
|
c3896c714a83
tools/cfgdump: Serialize individual (table) settings in stable order too
Kim Alvefur <zash@zash.se>
parents:
11569
diff
changeset
|
18 unquoted = true, table_iterator = function(t) return it.sorted_pairs(t, sort_anything); end, |
|
c3896c714a83
tools/cfgdump: Serialize individual (table) settings in stable order too
Kim Alvefur <zash@zash.se>
parents:
11569
diff
changeset
|
19 }) or serialization.serialize; |
|
13142
879a6a33c21b
tools: Update imports to use new prosody.* namespace
Kim Alvefur <zash@zash.se>
parents:
11570
diff
changeset
|
20 local configmanager = require"prosody.core.configmanager"; |
|
879a6a33c21b
tools: Update imports to use new prosody.* namespace
Kim Alvefur <zash@zash.se>
parents:
11570
diff
changeset
|
21 local startup = require "prosody.util.startup"; |
|
11192
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
22 |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
23 startup.set_function_metatable(); |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
24 local config_filename, onlyhost, onlyoption = ...; |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
25 |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
26 local ok, _, err = configmanager.load(config_filename or "./prosody.cfg.lua", "lua"); |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
27 assert(ok, err); |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
28 |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
29 if onlyhost then |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
30 if not onlyoption then |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
31 onlyhost, onlyoption = "*", onlyhost; |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
32 end |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
33 if onlyhost ~= "*" then |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
34 local component_module = configmanager.get(onlyhost, "component_module"); |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
35 |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
36 if component_module == "component" then |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
37 printf("Component %q", onlyhost); |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
38 elseif component_module then |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
39 printf("Component %q %q", onlyhost, component_module); |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
40 else |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
41 printf("VirtualHost %q", onlyhost); |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
42 end |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
43 end |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
44 printf("%s = %s", onlyoption or "?", serialize(configmanager.get(onlyhost, onlyoption))); |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
45 return; |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
46 end |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
47 |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
48 local config = configmanager.getconfig(); |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
49 |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
50 |
|
11569
08dab7df152b
tools/cfgdump: Iterate in sort order to give stable output
Kim Alvefur <zash@zash.se>
parents:
11192
diff
changeset
|
51 for host, hostcfg in it.sorted_pairs(config) do |
|
11192
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
52 local fixed = {}; |
|
11569
08dab7df152b
tools/cfgdump: Iterate in sort order to give stable output
Kim Alvefur <zash@zash.se>
parents:
11192
diff
changeset
|
53 for option, value in it.sorted_pairs(hostcfg) do |
|
11192
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
54 fixed[option] = value; |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
55 if option:match("ports?$") or option:match("interfaces?$") then |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
56 if option:match("s$") then |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
57 if type(value) ~= "table" then |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
58 fixed[option] = { value }; |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
59 end |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
60 else |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
61 if type(value) == "table" and #value > 1 then |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
62 fixed[option] = nil; |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
63 fixed[option.."s"] = value; |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
64 end |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
65 end |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
66 end |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
67 end |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
68 config[host] = fixed; |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
69 end |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
70 |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
71 local globals = config["*"]; config["*"] = nil; |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
72 |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
73 local function printsection(section) |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
74 local out, n = {}, 1; |
|
11569
08dab7df152b
tools/cfgdump: Iterate in sort order to give stable output
Kim Alvefur <zash@zash.se>
parents:
11192
diff
changeset
|
75 for k,v in it.sorted_pairs(section) do |
|
11192
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
76 out[n], n = s_format("%s = %s", k, serialize(v)), n + 1; |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
77 end |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
78 table.sort(out); |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
79 print(table.concat(out, "\n")); |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
80 end |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
81 |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
82 print("-------------- Prosody Exported Configuration File -------------"); |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
83 print(); |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
84 print("------------------------ Global section ------------------------"); |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
85 print(); |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
86 printsection(globals); |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
87 print(); |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
88 |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
89 local has_components = nil; |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
90 |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
91 print("------------------------ Virtual hosts -------------------------"); |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
92 |
|
11569
08dab7df152b
tools/cfgdump: Iterate in sort order to give stable output
Kim Alvefur <zash@zash.se>
parents:
11192
diff
changeset
|
93 for host, hostcfg in it.sorted_pairs(config) do |
|
11192
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
94 setmetatable(hostcfg, nil); |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
95 hostcfg.defined = nil; |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
96 |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
97 if hostcfg.component_module == nil then |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
98 print(); |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
99 printf("VirtualHost %q", host); |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
100 printsection(hostcfg); |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
101 else |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
102 has_components = true |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
103 end |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
104 end |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
105 |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
106 print(); |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
107 |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
108 if has_components then |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
109 print("------------------------- Components ---------------------------"); |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
110 |
|
11569
08dab7df152b
tools/cfgdump: Iterate in sort order to give stable output
Kim Alvefur <zash@zash.se>
parents:
11192
diff
changeset
|
111 for host, hostcfg in it.sorted_pairs(config) do |
|
11192
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
112 local component_module = hostcfg.component_module; |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
113 hostcfg.component_module = nil; |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
114 |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
115 if component_module then |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
116 print(); |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
117 if component_module == "component" then |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
118 printf("Component %q", host); |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
119 else |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
120 printf("Component %q %q", host, component_module); |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
121 hostcfg.component_module = nil; |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
122 hostcfg.load_global_modules = nil; |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
123 end |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
124 printsection(hostcfg); |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
125 end |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
126 end |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
127 end |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
128 |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
129 print() |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
130 print("------------------------- End of File --------------------------"); |
|
11f285a439a4
tools/cfgdump: Reads Prosody config file and pretty-prints it back out
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
131 |
