Daniel Barlow
d4e46dbe28
this means a watched service can stop and start without killing the subscriber, and that we can watch for services that don't yet exist
61 lines
1.3 KiB
Nix
61 lines
1.3 KiB
Nix
{
|
|
liminix,
|
|
lib,
|
|
lim,
|
|
s6,
|
|
s6-rc,
|
|
watch-outputs,
|
|
}:
|
|
{
|
|
watch,
|
|
service,
|
|
action,
|
|
}:
|
|
let
|
|
inherit (liminix.services) oneshot longrun;
|
|
inherit (builtins) map length head toString;
|
|
inherit (lib) unique optional optionals concatStringsSep;
|
|
inherit (service) name;
|
|
|
|
watched-services = unique (map (f: f "service") watch);
|
|
|
|
restart-flag =
|
|
{
|
|
restart = "-r";
|
|
restart-all = "-R";
|
|
"hup" = "-s 1";
|
|
"int" = "-s 2";
|
|
"quit" = "-s 3";
|
|
"kill" = "-s 9";
|
|
"term" = "-s 15";
|
|
"winch" = "-s 20";
|
|
"usr1" = "-s usr1";
|
|
"usr2" = "-s usr2";
|
|
}
|
|
.${action};
|
|
|
|
watcher =
|
|
let
|
|
name' = "restart-${name}";
|
|
refs = concatStringsSep " "
|
|
(map (s: "${s "service"}:${s "path"}") watch);
|
|
in
|
|
longrun {
|
|
name = name';
|
|
run = ''
|
|
dir=/run/service/${name}
|
|
echo waiting for $dir
|
|
if test -e $dir/notification-fd; then flag="-U"; else flag="-u"; fi
|
|
${s6}/bin/s6-svwait $flag /run/service/${name} || exit
|
|
PATH=${s6-rc}/bin:${s6}/bin:$PATH
|
|
${watch-outputs}/bin/watch-outputs ${restart-flag} ${name} ${refs}
|
|
'';
|
|
};
|
|
in
|
|
service.overrideAttrs (o: {
|
|
buildInputs = (lim.orEmpty o.buildInputs) ++ optional (watch != []) watcher;
|
|
dependencies =
|
|
(lim.orEmpty o.dependencies)
|
|
++ optional (watch != []) watcher;
|
|
})
|