Mercurial > prosody-modules
annotate misc/systemd/socket-activation.lua @ 6403:13c61a068c71
mod_pubsub_serverinfo: Include hostname in default pubsub node name
This change ensures that every host publishes to a unique node by default,
which is important when publishing info about multiple hosts.
The old default node name was "serverinfo"
The new default node name is in the format "serverinfo/example.com" where
example.com is automatically replaced by the publishing host's name.
This affects existing deployments in the following ways:
- If you already configured pubsub_serverinfo_node explicitly in your config,
then nothing will change, your current configuration will still be used.
- If you did not specify it in your config (i.e. used the default) then the
module will switch to publishing to the new node. If your configuration is
correct this shouldn't be noticed, because the new node will automatically
be created and configured by the module. If you want, you can clean up the
old 'serverinfo' node using:
prosodyctl shell pubsub delete_node pubsub.example.com serverinfo
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 11 Feb 2026 09:40:30 +0000 |
| parents | 3296a09b4e57 |
| children |
| rev | line source |
|---|---|
|
2352
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
1 -- Monkeypatch to support socket activation |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
2 -- |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
3 -- Requires LuaSocket after "agnostic" changes merged |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
4 -- |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
5 -- To enable: |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
6 -- RunScript "socket-activation.lua" |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
7 |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
8 local socket = require"socket"; |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
9 local tcp_serv_mt = debug.getregistry()["tcp{server}"]; |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
10 local socket_bind = socket.bind; |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
11 |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
12 local SD_LISTEN_FDS_START = 3; |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
13 |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
14 local fds = tonumber(os.getenv"LISTEN_FDS") or 0; |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
15 |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
16 if fds < SD_LISTEN_FDS_START then return; end |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
17 |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
18 local servs = {}; |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
19 |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
20 for i = 1, fds do |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
21 local serv = socket.tcp(); |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
22 if serv:getfd() >= 0 then |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
23 return; -- This won't work, we will leak the old FD |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
24 end |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
25 debug.setmetatable(serv, tcp_serv_mt); |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
26 serv:setfd(SD_LISTEN_FDS_START + i - 1); |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
27 local ip, port = serv:getsockname(); |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
28 servs [ ip .. ":" .. port ] = serv; |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
29 end |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
30 |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
31 function socket.bind( ip, port, backlog ) |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
32 local sock = servs [ ip .. ":" .. port ]; |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
33 if sock then |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
34 servs [ ip .. ":" .. port ] = nil; |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
35 return sock; |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
36 end |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
37 if next(servs) == nil then |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
38 -- my work here is done |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
39 socket.bind = socket_bind; |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
40 end |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
41 return socket_bind( ip, port, backlog ); |
|
3296a09b4e57
misc/systemd: Experimental files for enabling socket activation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
42 end |
