Taking some changes from pull/1

This commit is contained in:
SteveSandersonMS
2015-11-17 11:11:16 +00:00

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;