Merge pull request clue#2 from clue-labs/terminate

clue · clue · commit d7450f8568e4 · 2014-12-16T17:02:37.000+01:00
Forcefully terminate Process if its Stream closes
diff --git a/src/ProcessLauncher.php b/src/ProcessLauncher.php
@@ -38,6 +38,13 @@ public function createDeferredShell($process)
 
         $stream = new CompositeStream($process->stdout, $process->stdin);
 
+        // forcefully terminate process when stream closes
+        $stream->on('close', function () use ($process) {
+            if ($process->isRunning()) {
+                $process->terminate(SIGKILL);
+            }
+        });
+
         return new DeferredShell($stream);
     }
 }
diff --git a/tests/ProcessLauncherTest.php b/tests/ProcessLauncherTest.php
@@ -1,6 +1,7 @@
 <?php
 
 use Clue\React\Shell\ProcessLauncher;
+use React\Stream\ReadableStream;
 
 class ProcessLauncherTest extends TestCase
 {
@@ -25,4 +26,32 @@ public function testProcessWillBeStarted()
 
         $this->assertInstanceOf('Clue\React\Shell\DeferredShell', $shell);
     }
+
+    public function testClosingStreamTerminatesRunningProcess()
+    {
+        $process = $this->getMockBuilder('React\ChildProcess\Process')->disableOriginalConstructor()->getMock();
+        $process->stdout = new ReadableStream();
+        $process->stdin = $this->getMock('React\Stream\WritableStreamInterface');
+
+        $process->expects($this->once())->method('isRunning')->will($this->returnValue(true));
+        $process->expects($this->once())->method('terminate')->with($this->equalTo(SIGKILL));
+
+        $shell = $this->processLauncher->createDeferredShell($process);
+
+        $shell->close();
+    }
+
+    public function testClosingStreamOfNonRunningProcessWillNotTerminate()
+    {
+        $process = $this->getMockBuilder('React\ChildProcess\Process')->disableOriginalConstructor()->getMock();
+        $process->stdout = new ReadableStream();
+        $process->stdin = $this->getMock('React\Stream\WritableStreamInterface');
+
+        $process->expects($this->once())->method('isRunning')->will($this->returnValue(false));
+        $process->expects($this->never())->method('terminate');
+
+        $shell = $this->processLauncher->createDeferredShell($process);
+
+        $shell->close();
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,13 @@ public function createDeferredShell($process)`
`38`	`38`
`39`	`39`	`$stream = new CompositeStream($process->stdout, $process->stdin);`
`40`	`40`
	`41`	`+ // forcefully terminate process when stream closes`
	`42`	`+ $stream->on('close', function () use ($process) {`
	`43`	`+ if ($process->isRunning()) {`
	`44`	`+ $process->terminate(SIGKILL);`
	`45`	`+ }`
	`46`	`+ });`
	`47`	`+`
`41`	`48`	`return new DeferredShell($stream);`
`42`	`49`	`}`
`43`	`50`	`}`