Prefix vlsd logging w/ mathcing node ordinal

Author: ksedgwic

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

@@ -531,7 +531,7 @@ def getnewaddress(self):
 
 
 class ValidatingLightningSignerD(TailableProc):
-    def __init__(self, vlsd_dir, vlsd_port):
+    def __init__(self, vlsd_dir, vlsd_port, node_id):
         TailableProc.__init__(self, vlsd_dir)
         self.executable = env("REMOTE_SIGNER_CMD", 'vlsd')
         self.opts = [
@@ -547,7 +547,7 @@ def __init__(self, vlsd_dir, vlsd_port):
                 BITCOIND_CONFIG['rpcpassword'],
                 BITCOIND_CONFIG['rpcport']),
             ]
-        self.prefix = 'vlsd'
+        self.prefix = 'vlsd-%d' % (node_id)
         self.vlsd_port = vlsd_port
 
     @property
@@ -579,6 +579,7 @@ def __init__(self, lightning_dir, bitcoindproxy, port=9735, random_hsm=False, no
         self.lightning_dir = lightning_dir
         self.use_vlsd = False
         self.vlsd_dir = os.path.join(lightning_dir, "vlsd")
+        self.node_id = node_id
 
         self.rpcproxy = bitcoindproxy
 
@@ -663,7 +664,7 @@ def start(self, stdin=None, stdout=None, stderr=None,
             if self.use_vlsd:
                 # Start the remote signer first
                 vlsd_port = reserve()
-                self.vlsd = ValidatingLightningSignerD(self.vlsd_dir, vlsd_port)
+                self.vlsd = ValidatingLightningSignerD(self.vlsd_dir, vlsd_port, self.node_id)
                 self.vlsd.start(stdin, stdout, stderr, wait_for_initialized)
 
                 # We can't do this in the constructor because we need a new port on each restart.