danog/process
1
0
Fork 0
mirror of https://github.com/danog/process.git synced 2024-11-26 20:24:43 +01:00
Code Issues Projects Releases Wiki Activity

Fix kill during startup on Windows

Browse Source
This commit is contained in:
Niklas Keller 2017-12-05 09:44:06 +01:00
parent ff7d7612bb
commit 690d696dc9
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Internal/Windows/Runner.php
View File

@ -131,9 +131,12 @@ final class Runner implements ProcessRunner {
throw new ProcessException("Terminating process failed"); throw new ProcessException("Terminating process failed");
} }
$failStart = false;
if ($handle->childPidWatcher !== null) { if ($handle->childPidWatcher !== null) {
Loop::cancel($handle->childPidWatcher); Loop::cancel($handle->childPidWatcher);
$handle->childPidWatcher = null; $handle->childPidWatcher = null;
$failStart = true;
} }
if ($handle->exitCodeWatcher !== null) { if ($handle->exitCodeWatcher !== null) {
@ -142,7 +145,12 @@ final class Runner implements ProcessRunner {
} }
$handle->status = ProcessStatus::ENDED; $handle->status = ProcessStatus::ENDED;
$handle->joinDeferred->fail(new ProcessException("The process was killed"));
if ($failStart || $handle->stdioDeferreds) {
$this->socketConnector->failHandleStart($handle, "The process was killed");
} else {
$handle->joinDeferred->fail(new ProcessException("The process was killed"));
}
} }
/** @inheritdoc */ /** @inheritdoc */

2
lib/Internal/Windows/SocketConnector.php
View File

@ -57,7 +57,7 @@ final class SocketConnector {
unset($this->pendingClients[(int) $socket]); unset($this->pendingClients[(int) $socket]);
} }
private function failHandleStart(Handle $handle, string $message, ...$args) { public function failHandleStart(Handle $handle, string $message, ...$args) {
Loop::cancel($handle->connectTimeoutWatcher); Loop::cancel($handle->connectTimeoutWatcher);
unset($this->pendingProcesses[$handle->wrapperPid]); unset($this->pendingProcesses[$handle->wrapperPid]);