tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

RemoteCommandFile: Don't close stdin to support transmitting multiple commands

This commit is contained in:
Eric Lippmann 2016-06-09 16:43:06 +02:00
parent d4b9b6d303
commit 1bbe1b3620
1 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php
View File

@ -341,24 +341,6 @@ class RemoteCommandFile implements CommandTransportInterface
'Failed to write the whole command to the remote command pipe'
);
}
fclose($this->sshPipes[0]);
$readBuffer = $read = array($this->sshPipes[2]);
$write = null;
$except = null;
$stderr = '';
while (
false !== (stream_select($readBuffer, $write, $exceptBuffer, 0, 20000))
&& $this->getSshProcessStatus('running')
) {
if (! empty($readBuffer)) {
$stderr .= stream_get_contents($readBuffer[0]);
}
// Reset buffer
$readBuffer = $read;
}
if (! empty($stderr)) {
throw new CommandTransportException('Can\'t send external Icinga command: %s', trim($stderr));
}
} else {
$this->throwSshFailure();
}
@ -436,7 +418,7 @@ class RemoteCommandFile implements CommandTransportInterface
if (! is_resource($this->sshProcess)) {
throw new CommandTransportException(
'Can\'t send external Icinga command, failed to fork SSH'
'Can\'t send external Icinga command: Failed to fork SSH'
);
}
}
@ -473,9 +455,7 @@ class RemoteCommandFile implements CommandTransportInterface
public function __destruct()
{
if (is_resource($this->sshProcess)) {
if (is_resource($this->sshPipes[0])) {
fclose($this->sshPipes[0]);
}
fclose($this->sshPipes[0]);
fclose($this->sshPipes[1]);
fclose($this->sshPipes[2]);