dan/liminix
1
0
Fork 5
Code

add logtee to catchall logger

Browse Source
This commit is contained in:
Daniel Barlow 2024-09-16 21:30:06 +01:00
parent d3fce5edd4
commit 707a471bc2
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/s6/default.nix
View File

@ -1,4 +1,4 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, lim, ... }:
let let
inherit (pkgs) inherit (pkgs)
execline execline
@ -9,7 +9,7 @@ let
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;
inherit (lib) mkIf mkEnableOption mkOption types;
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
@ -110,6 +110,9 @@ let
#!${execline}/bin/execlineb -P #!${execline}/bin/execlineb -P
${execline}/bin/redirfd -w 1 /dev/null ${execline}/bin/redirfd -w 1 /dev/null
${execline}/bin/redirfd -rnb 0 fifo ${execline}/bin/redirfd -rnb 0 fifo
${if config.logshipper.enable then ''
pipeline { ${pkgs.logshipper}/bin/logtee /run/uncaught-logs/shipping logshipper-socket-event }
'' else ""}
${s6}/bin/s6-log -bpd3 -- t /run/uncaught-logs ${s6}/bin/s6-log -bpd3 -- t /run/uncaught-logs
''; '';
mode = "0755"; mode = "0755";
@ -203,6 +206,15 @@ let
}; };
}; };
in { in {
options = {
logshipper = {
enable = mkEnableOption "log shipping";
service = mkOption {
description = "log shipper";
type = pkgs.liminix.lib.types.service;
};
};
};
config = { config = {
filesystem = dir { filesystem = dir {
etc = dir { etc = dir {