dan/liminix
1
0
Fork 5
Code

log shipping service now gets logs on stdin

Browse Source 
instead of having to open the unix socket
This commit is contained in:
Daniel Barlow 2024-10-06 13:26:58 +01:00
parent b9999857cb
commit 2d7e6188ac
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
modules/s6/default.nix
View File

@ -8,7 +8,7 @@ let
stdenvNoCC; stdenvNoCC;
inherit (lib.lists) unique concatMap; inherit (lib.lists) unique concatMap;
inherit (pkgs.pseudofile) dir symlink; inherit (pkgs.pseudofile) dir symlink;
inherit (pkgs.liminix.services) oneshot bundle; inherit (pkgs.liminix.services) oneshot bundle longrun;
inherit (lib) mkIf mkEnableOption mkOption types; inherit (lib) mkIf mkEnableOption mkOption types;
cfg = config.logging; cfg = config.logging;
s6-rc-db = s6-rc-db =
@ -237,9 +237,28 @@ in {
}; };
imports = [ imports = [
( {config, pkgs, lib, ...}: ( {config, pkgs, lib, ...}:
let cfg = config.logging; let
cfg = config.logging;
pipeline = shipper: bundle {
name = "log-shipping-pipe";
contents = let
eat = longrun {
name = "log-shipping-pipe-eat";
run = ''
fdmove -c 12 1 \
${pkgs.s6}/bin/s6-ipcserver ${cfg.shipping.socket} \
fdmove -c 1 12 \
cat
'';
producer-for = spew.name;
};
spew = shipper.override {
consumer-for ="log-shipping-pipe-eat";
};
in [ eat spew ];
};
in mkIf cfg.shipping.enable { in mkIf cfg.shipping.enable {
services.${cfg.shipping.service.name} = cfg.shipping.service; services.${cfg.shipping.service.name} = pipeline cfg.shipping.service;
} }
)]; )];