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

Merge branch 'bugfix/monitoring-beautify-command-transport-errors-8006' 

fixes #8006
This commit is contained in:
Eric Lippmann 2015-05-28 16:34:12 +02:00
parent 70d98f3ae0 9f155ea99d
commit 068bfc0c71
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php
View File

@ -4,6 +4,7 @@
namespace Icinga\Module\Monitoring\Command\Transport;
use Exception;
use RuntimeException;
use Icinga\Application\Logger;
use Icinga\Exception\ConfigurationError;
use Icinga\Module\Monitoring\Command\Exception\TransportException;
@ -123,11 +124,15 @@ class LocalCommandFile implements CommandTransportInterface
$file->fwrite($commandString . "\n");
$file->fflush();
} catch (Exception $e) {
$message = $e->getMessage();
if ($e instanceof RuntimeException && ($pos = strrpos($message, ':')) !== false) {
// Assume RuntimeException thrown by SplFileObject in the format: __METHOD__ . "({$filename}): Message"
$message = substr($message, $pos + 1);
}
throw new TransportException(
'Can\'t send external Icinga command "%s" to the local command file "%s": %s',
$commandString,
'Can\'t send external Icinga command to the local command file "%s": %s',
$this->path,
$e
$message
);
}
}

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

@ -201,8 +201,7 @@ class RemoteCommandFile implements CommandTransportInterface
exec($ssh, $output, $status);
if ($status !== 0) {
throw new TransportException(
'Can\'t send external Icinga command "%s": %s',
$ssh,
'Can\'t send external Icinga command: %s',
implode(' ', $output)
);
}