greg/nix-bitcoin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

electrs: add option 'monitoringPort'

Browse Source
This commit is contained in:
Erik Arvstedt 2020-09-27 12:43:16 +02:00
parent 611cfe5a28
commit 24069aa2c6
No known key found for this signature in database
GPG Key ID: 33312B944DD97846
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/electrs.nix
View File

@ -34,13 +34,18 @@ in {
address = mkOption { address = mkOption {
type = types.str; type = types.str;
default = "127.0.0.1"; default = "127.0.0.1";
description = "RPC listening address."; description = "RPC and monitoring listening address.";
}; };
port = mkOption { port = mkOption {
type = types.port; type = types.port;
default = 50001; default = 50001;
description = "RPC port."; description = "RPC port.";
}; };
monitoringPort = mkOption {
type = types.port;
default = 4224;
description = "Prometheus monitoring port.";
};
extraArgs = mkOption { extraArgs = mkOption {
type = types.separatedString " "; type = types.separatedString " ";
default = ""; default = "";
@ -87,7 +92,8 @@ in {
} \ } \
--db-dir='${cfg.dataDir}' \ --db-dir='${cfg.dataDir}' \
--daemon-dir='${bitcoind.dataDir}' \ --daemon-dir='${bitcoind.dataDir}' \
--electrum-rpc-addr=${toString cfg.address}:${toString cfg.port} \ --electrum-rpc-addr=${cfg.address}:${toString cfg.port} \
--monitoring-addr=${cfg.address}:${toString cfg.monitoringPort} \
--daemon-rpc-addr=${builtins.elemAt bitcoind.rpcbind 0}:${toString bitcoind.rpc.port} \ --daemon-rpc-addr=${builtins.elemAt bitcoind.rpcbind 0}:${toString bitcoind.rpc.port} \
${cfg.extraArgs} ${cfg.extraArgs}
''; '';

5
test/scenarios/withnetns.py
View File

@ -15,9 +15,8 @@ btcpayserver_ip = "169.254.1.24"
def electrs(): def electrs():
machine.wait_until_succeeds( # prometeus metrics provider
"ip netns exec nb-electrs nc -z localhost 4224" machine.wait_until_succeeds(f"nc -z {electrs_ip} 4224")
) # prometeus metrics provider
def nbxplorer(): def nbxplorer():