From b9999857cbab939481de7bdf95c474963fcd534f Mon Sep 17 00:00:00 2001 From: Daniel Barlow Date: Sun, 6 Oct 2024 13:13:04 +0100 Subject: [PATCH] longrun: don't add logger if producer-for is already set --- pkgs/liminix-tools/services/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/liminix-tools/services/default.nix b/pkgs/liminix-tools/services/default.nix index f6603c4..feebdf4 100644 --- a/pkgs/liminix-tools/services/default.nix +++ b/pkgs/liminix-tools/services/default.nix @@ -53,6 +53,7 @@ let , run , notification-fd ? null , buildInputs ? [] + , producer-for ? null , ... } @ args: let logger = service { @@ -64,11 +65,11 @@ let pipeline-name = "${name}-pipeline"; }; in service (args // { - buildInputs = buildInputs ++ [ logger ]; + buildInputs = buildInputs ++ lib.optional (producer-for == null) logger; serviceType = "longrun"; run = serviceScript run; finish = cleanupScript name; - producer-for = "${name}-log"; + producer-for = if producer-for != null then producer-for else "${name}-log"; }); oneshot = { @@ -92,5 +93,6 @@ let }); target = bundle; in { - inherit target bundle oneshot longrun output; + inherit target bundle oneshot output; + longrun = lib.makeOverridable longrun; }