ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-06-17 14:58:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Include node name in the logging output from subprocesses.

Browse Source
This commit is contained in:
Itamar Turner-Trauring
2023-04-27 10:23:06 -04:00
parent 6d961eada9
commit 8f1d1cc1a0
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
integration/conftest.py
View File

@ -161,7 +161,7 @@ def flog_gatherer(reactor, temp_dir, flog_binary, request):
)
pytest_twisted.blockon(out_protocol.done)
twistd_protocol = _MagicTextProtocol("Gatherer waiting at")
twistd_protocol = _MagicTextProtocol("Gatherer waiting at", "gatherer")
twistd_process = reactor.spawnProcess(
twistd_protocol,
which('twistd')[0],
@ -244,7 +244,7 @@ log_gatherer.furl = {log_furl}
# "tahoe run" is consistent across Linux/macOS/Windows, unlike the old
# "start" command.
protocol = _MagicTextProtocol('introducer running')
protocol = _MagicTextProtocol('introducer running', "introducer")
transport = _tahoe_runner_optional_coverage(
protocol,
reactor,
@ -320,7 +320,7 @@ log_gatherer.furl = {log_furl}
# "tahoe run" is consistent across Linux/macOS/Windows, unlike the old
# "start" command.
protocol = _MagicTextProtocol('introducer running')
protocol = _MagicTextProtocol('introducer running', "tor_introducer")
transport = _tahoe_runner_optional_coverage(
protocol,
reactor,