dan/liminix
1
0
Fork 5
Code

copy logs to /dev/pmsg0 when ogging.persistent.enabled

Browse Source
This commit is contained in:
Daniel Barlow 2024-12-18 21:11:58 +00:00
parent 77cd4492b2
commit ffaca615ba
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
modules/s6/default.nix
View File

@ -7,10 +7,27 @@ let
s6-linux-init s6-linux-init
stdenvNoCC; stdenvNoCC;
inherit (lib.lists) unique concatMap; inherit (lib.lists) unique concatMap;
inherit (lib) concatStrings;
inherit (builtins) map;
inherit (pkgs.pseudofile) dir symlink; inherit (pkgs.pseudofile) dir symlink;
inherit (pkgs.liminix.services) oneshot bundle longrun; 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;
logger =
let pipecmds =
["${s6}/bin/s6-log -bpd3 -- ${cfg.script} 1"] ++
(lib.optional cfg.persistent.enable
"/bin/tee /dev/pmsg0") ++
(lib.optional cfg.shipping.enable
"${pkgs.logshipper}/bin/logtap ${cfg.shipping.socket} logshipper-socket-event");
in ''
#!${execline}/bin/execlineb -P
${execline}/bin/redirfd -w 1 /dev/null
${execline}/bin/redirfd -rnb 0 fifo
${concatStrings (map (l: "pipeline { ${l} }\n") pipecmds)}
${s6}/bin/s6-log -- ${cfg.directory}
'';
s6-rc-db = s6-rc-db =
let let
# In the default bundle we need to have all the services # In the default bundle we need to have all the services
@ -106,21 +123,7 @@ let
mode = "0600"; mode = "0600";
}; };
notification-fd = { file = "3"; }; notification-fd = { file = "3"; };
run = { run = { file = logger; mode = "0755"; };
file = ''
#!${execline}/bin/execlineb -P
${execline}/bin/redirfd -w 1 /dev/null
${execline}/bin/redirfd -rnb 0 fifo
${if cfg.shipping.enable then ''
pipeline { ${s6}/bin/s6-log -bpd3 -- ${cfg.script} 1 }
pipeline { ${pkgs.logshipper}/bin/logtap ${cfg.shipping.socket} logshipper-socket-event }
${s6}/bin/s6-log -- ${cfg.directory}
'' else ''
${s6}/bin/s6-log -bpd3 -- ${cfg.script} ${cfg.directory}
''}
'';
mode = "0755";
};
}; };
getty = dir { getty = dir {
run = { run = {