maxmustermann/PowerShell
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix the issue that PS only stops transcription when all runspaces are closed (#3896)

Browse source 
Only stop transcription when all runspaces are closed
This commit is contained in:
Chunqing Chen 2017-06-14 06:44:06 +08:00 committed by Travis Plunk
parent 6bb12c9df5
commit 65f96e0298
2 changed files with 44 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/System.Management.Automation/engine/hostifaces/LocalConnection.cs
View file

@ -863,12 +863,24 @@ namespace System.Management.Automation.Runspaces
}
if ((hostRunspace == null) || (this == hostRunspace))
{
{
// We should close transcripting only if we are closing the last opened runspace.
foreach (Runspace runspace in RunspaceList)
{
// At this stage, the last opened runspace should be at closing state.
if (runspace.RunspaceStateInfo.State == RunspaceState.Opened)
{
return;
}
}
PSHostUserInterface host = executionContext.EngineHostInterface.UI;
if (host != null)
{
host.StopAllTranscribing();
}
AmsiUtils.Uninitialize();
}
}
@ -913,10 +925,7 @@ namespace System.Management.Automation.Runspaces
//Log engine lifecycle event.
MshLog.LogEngineLifecycleEvent(_engine.Context, EngineState.Stopped);
// Uninitialize the AMSI scan interface
AmsiUtils.Uninitialize();
//All pipelines have been canceled. Close the runspace.
_engine = null;
_commandFactory = null;

30
test/powershell/Modules/Microsoft.Powershell.Host/Start-Transcript.Tests.ps1
View file

@ -106,4 +106,34 @@ Describe "Start-Transcript, Stop-Transcript tests" -tags "CI" {
$expectedError = "CannotStartTranscription,Microsoft.PowerShell.Commands.StartTranscriptCommand"
ValidateTranscription -scriptToExecute $script -outputFilePath $null -expectedError $expectedError
}
It "Transcription should remain active if other runspace in the host get closed" {
try{
$ps = [powershell]::Create()
$ps.addscript("Start-Transcript -path $transcriptFilePath").Invoke()
$ps.addscript('$rs = [system.management.automation.runspaces.runspacefactory]::CreateRunspace()').Invoke()
$ps.addscript('$rs.open()').Invoke()
$ps.addscript('$rs.Dispose()').Invoke()
$ps.addscript('Write-Host "After Dispose"').Invoke()
$ps.addscript("Stop-Transcript").Invoke()
} finally {
if ($ps -ne $null) {
$ps.Dispose()
}
}
Test-Path $transcriptFilePath | Should be $true
$transcriptFilePath | Should contain "After Dispose"
}
It "Transcription should be closed if the only runspace gets closed" {
$powerShellPath = [System.Diagnostics.Process]::GetCurrentProcess().Path
$powerShellCommand = $powerShellPath + ' "start-transcript $transcriptFilePath; Write-Host ''Before Dispose'';"'
Invoke-Expression $powerShellCommand
Test-Path $transcriptFilePath | Should be $true
$transcriptFilePath | Should contain "Before Dispose"
$transcriptFilePath | Should contain "Windows PowerShell transcript end"
}
}