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

IcingaObject: die when there was no error handler

This commit is contained in:
Thomas Gelf 2015-06-15 16:36:51 +02:00
parent 91dde44441
commit 828a4a709b
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
library/Director/Objects/IcingaObject.php
View File

@ -224,8 +224,12 @@ abstract class IcingaObject extends DbObject
trigger_error($e); trigger_error($e);
$previousHandler = set_exception_handler(function () {}); $previousHandler = set_exception_handler(function () {});
restore_error_handler(); restore_error_handler();
call_user_func($previousHandler, $e); if ($previousHandler !== null) {
die(); call_user_func($previousHandler, $e);
die();
} else {
die($e->getMessage());
}
} }
} }
} }