Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[releases/1.2] Fix the discovery service to not terminate on parent process closure #391

Merged
merged 3 commits into from
Sep 21, 2023
Merged

[releases/1.2] Fix the discovery service to not terminate on parent process closure #391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6af13b3
Add DETACHED_PROCESS flag to detach the discovery process from its pa…
samchris007 Sep 19, 2023
b4e7a49
Fix test failure
samchris007 Sep 19, 2023
38be10c
Merge branch 'releases/1.2' into users/sam/fixdiscovery-termination-p…
dixonjoel Sep 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ni_measurementlink_service/_internal/discovery_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ def _start_service(
kwargs: Dict[str, Any] = {}
if sys.platform == "win32":
# Terminating the measurement service should not terminate the discovery service.
kwargs["creationflags"] = subprocess.CREATE_BREAKAWAY_FROM_JOB
kwargs["creationflags"] = subprocess.CREATE_BREAKAWAY_FROM_JOB | subprocess.DETACHED_PROCESS
discovery_service_subprocess = subprocess.Popen(
[exe_file_path],
cwd=exe_file_path.parent,
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/test_discovery_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ def test___discovery_service_exe_unavailable___register_service___raises_file_no
def subprocess_popen_kwargs() -> Dict[str, Any]:
kwargs: Dict[str, Any] = {}
if sys.platform == "win32":
kwargs["creationflags"] = subprocess.CREATE_BREAKAWAY_FROM_JOB
kwargs["creationflags"] = subprocess.CREATE_BREAKAWAY_FROM_JOB | subprocess.DETACHED_PROCESS
return kwargs


Expand Down
Loading