Inline

IntersectMBO · Aug 8, 2022 · 158dd62 · 158dd62
1 parent a612eff
commit 158dd62
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 18 deletions.
diff --git a/nix/workbench/docker.nix b/nix/workbench/docker.nix
@@ -80,15 +80,15 @@ let
               ByronGenesisFile     = "../genesis/byron/genesis.json";
             }
             // optionalAttrs enableEKG
-            {
-              hasEKG               = port + supervisord.portShiftEkg;
-              hasPrometheus        = [
-                "127.0.0.1" (port + supervisord.portShiftPrometheus)
-              ];
+            (let portShiftEkg        = 100;
+                 portShiftPrometheus = 200;
+            in {
+              hasEKG               = port + portShiftEkg;
+              hasPrometheus        = ["127.0.0.1" (port + portShiftPrometheus)];
               setupBackends = [
                 "EKGViewBK"
               ];
-            }
+            })
           );
 
       finaliseNodeArgs =
@@ -145,9 +145,6 @@ let
           inherit
             extraSupervisorConfig;
 
-          portShiftEkg        = 100;
-          portShiftPrometheus = 200;
-
           ## mkSupervisorConf :: Profile -> SupervisorConf
           mkSupervisorConf =
             profile:

diff --git a/nix/workbench/supervisor.nix b/nix/workbench/supervisor.nix
@@ -80,15 +80,15 @@ let
               ByronGenesisFile     = "../genesis/byron/genesis.json";
             }
             // optionalAttrs enableEKG
-            {
-              hasEKG               = port + supervisord.portShiftEkg;
-              hasPrometheus        = [
-                "127.0.0.1" (port + supervisord.portShiftPrometheus)
-              ];
+            (let portShiftEkg        = 100;
+                 portShiftPrometheus = 200;
+            in {
+              hasEKG = port + portShiftEkg;
+              hasPrometheus = ["127.0.0.1" (port + portShiftPrometheus)];
               setupBackends = [
                 "EKGViewBK"
               ];
-            }
+            })
           );
 
       finaliseNodeArgs =
@@ -145,9 +145,6 @@ let
           inherit
             extraSupervisorConfig;
 
-          portShiftEkg        = 100;
-          portShiftPrometheus = 200;
-
           ## mkSupervisorConf :: Profile -> SupervisorConf
           mkSupervisorConf =
             profile: