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

Don't throw exception if logfile is not found

Browse Source 
fixes #6035
This commit is contained in:
Alexander Klimov 2014-04-23 12:20:32 +02:00
parent f510130797
commit 6973b04211
1 changed files with 65 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
library/Icinga/Protocol/File/Reader.php
View File

@ -184,7 +184,8 @@ class Reader implements DatasourceInterface
$PHP_EOL_len = strlen(PHP_EOL); $PHP_EOL_len = strlen(PHP_EOL);
$lines = array(); $lines = array();
$s = ''; $s = '';
$f = fopen($this->filename, 'rb'); $f = @fopen($this->filename, 'rb');
if ($f !== false) {
$buffer = ''; $buffer = '';
fseek($f, 0, SEEK_END); fseek($f, 0, SEEK_END);
if (ftell($f) === 0) { if (ftell($f) === 0) {
@ -212,6 +213,7 @@ class Reader implements DatasourceInterface
$s = ''; $s = '';
} }
} }
}
return $lines; return $lines;
} }
@ -252,7 +254,8 @@ class Reader implements DatasourceInterface
$PHP_EOL_len = strlen(PHP_EOL); $PHP_EOL_len = strlen(PHP_EOL);
$lines = array(); $lines = array();
$s = ''; $s = '';
$f = fopen($this->filename, 'rb'); $f = @fopen($this->filename, 'rb');
if ($f !== false) {
$buffer = ''; $buffer = '';
while ($read_lines === null || count($lines) < $read_lines) { while ($read_lines === null || count($lines) < $read_lines) {
if (strlen($buffer) === 0) { if (strlen($buffer) === 0) {
@ -279,6 +282,7 @@ class Reader implements DatasourceInterface
$s = ''; $s = '';
} }
} }
}
return $lines; return $lines;
} }
@ -293,7 +297,8 @@ class Reader implements DatasourceInterface
$PHP_EOL_len = strlen(PHP_EOL); $PHP_EOL_len = strlen(PHP_EOL);
$lines = 0; $lines = 0;
$s = ''; $s = '';
$f = fopen($this->filename, 'rb'); $f = @fopen($this->filename, 'rb');
if ($f !== false) {
$buffer = ''; $buffer = '';
while (true) { while (true) {
if (strlen($buffer) === 0) { if (strlen($buffer) === 0) {
@ -314,6 +319,7 @@ class Reader implements DatasourceInterface
$s = ''; $s = '';
} }
} }
}
return $lines; return $lines;
} }
} }