huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix issue with remote deployer wait

This commit is contained in:
Andrew Stanton-Nurse 2017-04-03 08:48:58 -07:00 committed by GitHub
parent 915e984f32
commit 11de3fd384
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/RemoteWindowsDeployer/RemoteWindowsDeployer.cs
View File

@ -252,19 +252,17 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
using (var runScriptsOnRemoteServerProcess = new Process() { StartInfo = startInfo }) using (var runScriptsOnRemoteServerProcess = new Process() { StartInfo = startInfo })
{ {
var processExited = new TaskCompletionSource<object>();
runScriptsOnRemoteServerProcess.EnableRaisingEvents = true; runScriptsOnRemoteServerProcess.EnableRaisingEvents = true;
runScriptsOnRemoteServerProcess.Exited += (sender, exitedArgs) => runScriptsOnRemoteServerProcess.Exited += (sender, exitedArgs) =>
{ {
Logger.LogInformation($"[{_deploymentParameters.ServerName} {serverAction} stdout]: script complete"); Logger.LogInformation($"[{_deploymentParameters.ServerName} {serverAction} stdout]: script complete");
processExited.TrySetResult(null);
}; };
runScriptsOnRemoteServerProcess.StartAndCaptureOutAndErrToLogger(serverAction, Logger); runScriptsOnRemoteServerProcess.StartAndCaptureOutAndErrToLogger(serverAction, Logger);
await processExited.Task.OrTimeout(TimeSpan.FromMinutes(5)); // Wait a second for the script to run or fail. The StartServer script will only terminate when the Deployer is disposed,
runScriptsOnRemoteServerProcess.WaitForExit((int)TimeSpan.FromMinutes(1).TotalMilliseconds); // so we don't want to wait for it to terminate here because it would deadlock.
await Task.Delay(TimeSpan.FromMinutes(1));
if (runScriptsOnRemoteServerProcess.HasExited && runScriptsOnRemoteServerProcess.ExitCode != 0) if (runScriptsOnRemoteServerProcess.HasExited && runScriptsOnRemoteServerProcess.ExitCode != 0)
{ {