tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-28 16:24:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Don't throw any exception

Browse Source 
refs #8705
This commit is contained in:
Alexander A. Klimov 2015-06-05 17:12:32 +02:00
parent 38cecdb724
commit 76e748c483
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
library/Icinga/Application/Platform.php
View File

@ -3,8 +3,6 @@
namespace Icinga\Application; namespace Icinga\Application;
use Icinga\Exception\IcingaException;
/** /**
* Platform tests for icingaweb * Platform tests for icingaweb
*/ */
@ -95,7 +93,7 @@ class Platform
foreach ($osRelease as $osInfo) { foreach ($osRelease as $osInfo) {
if (false === ($res = @preg_match('/(?<!.)[ \t]*#/ms', $osInfo))) { if (false === ($res = @preg_match('/(?<!.)[ \t]*#/ms', $osInfo))) {
throw new IcingaException('Failed at preg_match()'); return false;
} }
if ($res === 1) { if ($res === 1) {
continue; continue;
@ -107,7 +105,7 @@ class Platform
$osInfo, $osInfo,
$matches $matches
))) { ))) {
throw new IcingaException('Failed at preg_match()'); return false;
} }
if (! ($res === 0 || $matches[2] === '' || $matches[2] === 'linux')) { if (! ($res === 0 || $matches[2] === '' || $matches[2] === 'linux')) {
return $matches[2]; return $matches[2];
@ -159,7 +157,7 @@ class Platform
if ($reliable < 1) { if ($reliable < 1) {
if (false === ($procVersion = @file_get_contents('/proc/version'))) { if (false === ($procVersion = @file_get_contents('/proc/version'))) {
throw new IcingaException('Failed at file_get_contents(/proc/version)'); return false;
} }
$procVersion = strtolower($procVersion); $procVersion = strtolower($procVersion);
foreach (array( foreach (array(