Skip to content

Commit f70fbbb

Browse files
committed
Prefix vlsd logging w/ mathcing node ordinal
1 parent d3a8cef commit f70fbbb

File tree

1 file changed

+4
-3
lines changed
  • contrib/pyln-testing/pyln/testing

1 file changed

+4
-3
lines changed

contrib/pyln-testing/pyln/testing/utils.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -580,7 +580,7 @@ def getnewaddress(self):
580580

581581

582582
class ValidatingLightningSignerD(TailableProc):
583-
def __init__(self, vlsd_dir, vlsd_port):
583+
def __init__(self, vlsd_dir, vlsd_port, node_id):
584584
TailableProc.__init__(self, vlsd_dir)
585585
self.executable = env("REMOTE_SIGNER_CMD", 'vlsd')
586586
self.opts = [
@@ -596,7 +596,7 @@ def __init__(self, vlsd_dir, vlsd_port):
596596
BITCOIND_CONFIG['rpcpassword'],
597597
BITCOIND_CONFIG['rpcport']),
598598
]
599-
self.prefix = 'vlsd'
599+
self.prefix = 'vlsd-%d' % (node_id)
600600
self.vlsd_port = vlsd_port
601601

602602
@property
@@ -636,6 +636,7 @@ def __init__(
636636
self.lightning_dir = lightning_dir
637637
self.use_vlsd = False
638638
self.vlsd_dir = os.path.join(lightning_dir, "vlsd")
639+
self.node_id = node_id
639640

640641
self.rpcproxy = bitcoindproxy
641642
self.env['CLN_PLUGIN_LOG'] = "cln_plugin=trace,cln_rpc=trace,cln_grpc=trace,debug"
@@ -727,7 +728,7 @@ def start(self, stdin=None, wait_for_initialized=True, stderr_redir=False):
727728
if self.use_vlsd:
728729
# Start the remote signer first
729730
vlsd_port = reserve()
730-
self.vlsd = ValidatingLightningSignerD(self.vlsd_dir, vlsd_port)
731+
self.vlsd = ValidatingLightningSignerD(self.vlsd_dir, vlsd_port, self.node_id)
731732
self.vlsd.start(stdin, stdout, stderr, wait_for_initialized)
732733

733734
# We can't do this in the constructor because we need a new port on each restart.

0 commit comments

Comments
 (0)