Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-08 09:08:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

cli: stop tunnel processes during update (#187738)

Browse Source 
* untested wip

* make it work
This commit is contained in:
Connor Peet
2023-07-12 11:58:09 -07:00
committed by GitHub
parent 87baaea6d1
commit cbb47129d3
2 changed files with 32 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/gulpfile.vscode.win32.js
+1
View File
@@ -98,6 +98,7 @@ function buildWin32Setup(arch, target) {
AppMutex: product.win32MutexName,
TunnelMutex: product.win32TunnelMutex,
TunnelServiceMutex: product.win32TunnelServiceMutex,
TunnelApplicationName: product.tunnelApplicationName,
ApplicationName: product.applicationName,
Arch: arch,
AppId: { 'ia32': ia32AppId, 'x64': x64AppId, 'arm64': arm64AppId }[arch],
build/win32/code.iss
+30 -7
View File
@@ -1362,12 +1362,6 @@ begin
end;
end;
if IsNotBackgroundUpdate() and CheckForMutexes('{#TunnelMutex}') then
begin
MsgBox('{#NameShort} is still running a tunnel. Please stop the tunnel before installing.', mbInformation, MB_OK);
Result := false
end;
end;
function WizardNotSilent(): Boolean;
@@ -1380,6 +1374,31 @@ end;
var
ShouldRestartTunnelService: Boolean;
function StopTunnelOtherProcesses(): Boolean;
var
WaitCounter: Integer;
TaskKilled: Integer;
begin
Log('Stopping all tunnel services (at ' + ExpandConstant('"{app}\bin\{#TunnelApplicationName}.exe"') + ')');
ShellExec('', 'powershell.exe', '-Command "Get-WmiObject Win32_Process | Where-Object { $_.ExecutablePath -eq ' + ExpandConstant('''{app}\bin\{#TunnelApplicationName}.exe''') + ' } | Select @{Name=''Id''; Expression={$_.ProcessId}} | Stop-Process -Force"', '', SW_HIDE, ewWaitUntilTerminated, TaskKilled)
WaitCounter := 10;
while (WaitCounter > 0) and CheckForMutexes('{#TunnelMutex}') do
begin
Log('Tunnel process is is still running, waiting');
Sleep(500);
WaitCounter := WaitCounter - 1
end;
if CheckForMutexes('{#TunnelMutex}') then
begin
Log('Unable to stop tunnel processes');
Result := False;
end
else
Result := True;
end;
procedure StopTunnelServiceIfNeeded();
var
StopServiceResultCode: Integer;
@@ -1413,7 +1432,11 @@ function PrepareToInstall(var NeedsRestart: Boolean): String;
begin
if IsNotBackgroundUpdate() then
StopTunnelServiceIfNeeded();
Result := ''
if IsNotBackgroundUpdate() and not StopTunnelOtherProcesses() then
Result := '{#NameShort} is still running a tunnel process. Please stop the tunnel before installing.'
else
Result := '';
end;
// VS Code will create a flag file before the update starts (/update=C:\foo\bar)