Skip to content

Commit 1ac2574

Browse files
fmastedeepfire
authored andcommitted
workbench: supervisor.conf tracer is optional
1 parent ec11b8d commit 1ac2574

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

nix/workbench/backend/nomad.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ let
7777
};
7878
supervisorConf =
7979
import ./supervisor-conf.nix
80-
{ inherit (profileNix) node-services;
80+
{ inherit profileNix;
8181
inherit pkgs lib stateDir;
8282
unixHttpServerPort = "/tmp/supervisor.sock";
8383
};

nix/workbench/backend/supervisor-conf.nix

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{ pkgs
22
, lib
33
, stateDir
4-
, node-services
4+
, profileNix
55
, unixHttpServerPort ? null
66
, inetHttpServerPort ? null
77
}:
@@ -41,7 +41,7 @@ let
4141
}
4242
//
4343
listToAttrs
44-
(mapAttrsToList (_: nodeSvcSupervisorProgram) node-services)
44+
(mapAttrsToList (_: nodeSvcSupervisorProgram) (profileNix.node-services))
4545
//
4646
{
4747
"program:generator" = {
@@ -58,7 +58,7 @@ let
5858
};
5959
}
6060
//
61-
{
61+
lib.attrsets.optionalAttrs (profileNix.value.node.tracer) {
6262
"program:tracer" = {
6363
directory = "${stateDir}/tracer";
6464
command = "sh start.sh";

nix/workbench/backend/supervisor.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ let
3232
materialise-profile =
3333
{ stateDir, profileNix }:
3434
let supervisorConf = import ./supervisor-conf.nix
35-
{ inherit (profileNix) node-services;
35+
{ inherit profileNix;
3636
inherit pkgs lib stateDir;
3737
inetHttpServerPort = "127.0.0.1:9001";
3838
};

0 commit comments

Comments
 (0)