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

Merge branch 'master' into bugfix/separate-sort-controls-9421

This commit is contained in:
Johannes Meyer 2015-07-27 11:50:05 +02:00
parent 4d9aa54814 a14da1c558
commit 9cc7b45458
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/Icinga/Data/Inspection.php
View File

@ -59,6 +59,7 @@ class Inspection
if ($entry instanceof Inspection) {
$this->log[$entry->description] = $entry->toArray();
} else {
Logger::debug($entry);
$this->log[] = $entry;
}
}
@ -77,7 +78,8 @@ class Inspection
if (isset($this->error)) {
throw new ProgrammingError('Inspection object used after error');
}
$this->write($entry);
Logger::error($entry);
$this->log[] = $entry;
$this->error = $entry;
return $this;
}