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

Merge branch 'rjperes-master'

This commit is contained in:
SteveSandersonMS 2015-11-17 11:11:32 +00:00
parent 717fb37034 740b1a305b
commit 1a746fec5e
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Microsoft.AspNet.NodeServices/HostingModels/OutOfProcessNodeInstance.cs
View File

@ -78,9 +78,11 @@ namespace Microsoft.AspNet.NodeServices {
} }
} }
var initializationSucceeded = await this._nodeProcessIsReadySource.Task; var task = this._nodeProcessIsReadySource.Task;
var initializationSucceeded = await task;
if (!initializationSucceeded) { if (!initializationSucceeded) {
throw new InvalidOperationException("The Node.js process failed to initialize"); throw new InvalidOperationException("The Node.js process failed to initialize", task.Exception);
} }
} }
@ -136,7 +138,7 @@ namespace Microsoft.AspNet.NodeServices {
} }
if (this._nodeProcess != null && !this._nodeProcess.HasExited) { if (this._nodeProcess != null && !this._nodeProcess.HasExited) {
this._nodeProcess.Kill(); // TODO: Is there a more graceful way to end it? Or does this still let it perform any cleanup? System.Console.WriteLine("Killed"); this._nodeProcess.Kill(); // TODO: Is there a more graceful way to end it? Or does this still let it perform any cleanup?
} }
disposed = true; disposed = true;