danio
/
nixos-matrix-modules
mirror of https://github.com/dali99/nixos-matrix-modules.git
1
1
Fork 0
Code Issues Releases Activity

simplify mainReplicationListener stuff

This commit is contained in:
Daniel Lovbrotte Olsen 2023-01-20 05:03:42 +01:00
parent fbee6a0c0d
commit 5ef8873997
1 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
synapse-module/workers.nix
View File

@ -22,17 +22,15 @@
genAttrs' = items: f: g: builtins.listToAttrs (map (i: lib.nameValuePair (f i) (g i)) items); genAttrs' = items: f: g: builtins.listToAttrs (map (i: lib.nameValuePair (f i) (g i)) items);
isReplicationListener = isListenerType = type: l: lib.any (r: lib.any (n: n == type) r.names) l.resources;
l: lib.any (r: lib.any (n: n == "replication") r.names) l.resources; firstListenerOfType = type: w: lib.lists.findFirst (isListenerType type)
(throw' "No listener with resource: ${type} configured")
w.settings.listeners;
listenerHost = l: builtins.head l.bind_addresses;
listenerPort = l: l.port;
socketAddressOfType = type: w: let l = firstListenerOfType type w; in "${listenerHost l}:${listenerPort l}";
mainReplicationListener = lib.lists.findFirst isReplicationListener mainReplicationListener = firstListenerOfType "replication" cfg;
(throw' "No replication listener configured!")
cfg.settings.listeners;
mainReplicationListenerHost =
if mainReplicationListener.bind_addresses == []
then throw' "Replication listener had no addresses"
else builtins.head mainReplicationListener.bind_addresses;
mainReplicationListenerPort = mainReplicationListener.port;
in { in {
# See https://github.com/matrix-org/synapse/blob/develop/docs/workers.md for more info # See https://github.com/matrix-org/synapse/blob/develop/docs/workers.md for more info
options.services.matrix-synapse-next.workers = let options.services.matrix-synapse-next.workers = let
@ -186,16 +184,16 @@ in {
mainReplicationHost = mkOption { mainReplicationHost = mkOption {
type = types.str; type = types.str;
default = default =
if builtins.elem mainReplicationListenerHost [ "0.0.0.0" "::" ] if builtins.elem (listenerHost mainReplicationListener) [ "0.0.0.0" "::" ]
then "127.0.0.1" then "127.0.0.1"
else mainReplicationListenerHost; else listenerHost mainReplicationListener;
# TODO: add defaultText # TODO: add defaultText
description = "Host of the main synapse instance's replication listener"; description = "Host of the main synapse instance's replication listener";
}; };
mainReplicationPort = mkOption { mainReplicationPort = mkOption {
type = types.port; type = types.port;
default = mainReplicationListenerPort; default = listenerPort mainReplicationListener;
# TODO: add defaultText # TODO: add defaultText
description = "Port for the main synapse instance's replication listener"; description = "Port for the main synapse instance's replication listener";
}; };
@ -260,15 +258,10 @@ in {
instance_map = genAttrs' (lib.lists.range 1 wcfg.eventPersisters) instance_map = genAttrs' (lib.lists.range 1 wcfg.eventPersisters)
(i: "auto-event-persist${toString i}") (i: "auto-event-persist${toString i}")
(i: let (i: let
wRL = lib.lists.findFirst isReplicationListener wRL = firstListenerOfType "replication" wcfg.instances."auto-event-persist${toString i}".settings.worker_listeners;
(throw' "No replication listener configured!")
wcfg.instances."auto-event-persist${toString i}".settings.worker_listeners;
wRH = lib.findFirst (x: true) (throw' "Replication listener had no addresses")
wRL.bind_addresses;
wRP = wRL.port;
in { in {
host = wRH; host = listenerHost wRL;
port = wRP; port = listenerPort wRL;
}); });
stream_writers.events = stream_writers.events =