diff --git a/deploy_tool/deployer.py b/deploy_tool/deployer.py index 9d748ae..427efaf 100644 --- a/deploy_tool/deployer.py +++ b/deploy_tool/deployer.py @@ -620,6 +620,7 @@ def _restart_backend( cwd=cwd, stdin=subprocess.DEVNULL, shell=False, + env=_service_console_environment(), creationflags=_backend_console_creation_flags(), ) else: @@ -668,6 +669,13 @@ def _service_console_launcher() -> list[str]: return [sys.executable, str(console_runner)] +def _service_console_environment() -> dict[str, str]: + environment = os.environ.copy() + if getattr(sys, "frozen", False): + environment["PYINSTALLER_RESET_ENVIRONMENT"] = "1" + return environment + + def _restart_ssm_backend( command: list[str], cwd: Path, diff --git a/tests/test_deployer.py b/tests/test_deployer.py index faea43d..1374138 100644 --- a/tests/test_deployer.py +++ b/tests/test_deployer.py @@ -84,6 +84,12 @@ class DeployerTests(unittest.TestCase): self.assertEqual(launcher, [deployer_module.sys.executable, "--service-console"]) + def test_frozen_service_console_starts_as_independent_pyinstaller_instance(self): + with patch.object(deployer_module.sys, "frozen", True, create=True): + environment = deployer_module._service_console_environment() + + self.assertEqual(environment["PYINSTALLER_RESET_ENVIRONMENT"], "1") + def test_extracts_backend_port_from_java_system_property(self): extract_port = getattr(deployer_module, "_extract_server_port", lambda command: None)