From 2d7e6188acb4e8c37a2addd2402a9db351c77168 Mon Sep 17 00:00:00 2001
From: Daniel Barlow <dan@telent.net>
Date: Sun, 6 Oct 2024 13:26:58 +0100
Subject: [PATCH] log shipping service now gets logs on stdin

instead of having to open the unix socket
---
 modules/s6/default.nix | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/modules/s6/default.nix b/modules/s6/default.nix
index 60083c2..1a98f41 100644
--- a/modules/s6/default.nix
+++ b/modules/s6/default.nix
@@ -8,7 +8,7 @@ let
     stdenvNoCC;
   inherit (lib.lists) unique concatMap;
   inherit (pkgs.pseudofile) dir symlink;
-  inherit (pkgs.liminix.services) oneshot bundle;
+  inherit (pkgs.liminix.services) oneshot bundle longrun;
   inherit (lib) mkIf mkEnableOption mkOption types;
   cfg = config.logging;
   s6-rc-db =
@@ -237,9 +237,28 @@ in {
   };
   imports = [
     ( {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 {
-        services.${cfg.shipping.service.name} = cfg.shipping.service;
+        services.${cfg.shipping.service.name} = pipeline cfg.shipping.service;
       }
     )];