Commit 70fb5336 authored by Sebastian Kummer's avatar Sebastian Kummer

Merge pull request #59 in ZP/z-push from...

Merge pull request #59 in ZP/z-push from bugfix/ZP-711-zpush_fatal_handler-reports-PHP-Notice-Warning-as-FATAL-in-z-push-error.log to develop

* commit '0b72fe9f':
  ZP-711 zpush_fatal_handler reports PHP Notice & Warning as FATAL in z-plush(-error).log. Released under the Affero GNU General Public License (AGPL) version 3.
parents 64f7bbb2 0b72fe9f
......@@ -300,11 +300,14 @@ function debugLog($message) {
ZLog::Write(LOGLEVEL_DEBUG, $message);
}
// E_DEPRECATED only available since PHP 5.3.0
if (!defined('E_DEPRECATED')) define(E_DEPRECATED, 8192);
// TODO review error handler
function zarafa_error_handler($errno, $errstr, $errfile, $errline, $errcontext) {
$bt = debug_backtrace();
switch ($errno) {
case 8192: // E_DEPRECATED since PHP 5.3.0
case E_DEPRECATED:
// do not handle this message
break;
......@@ -347,7 +350,8 @@ function zpush_fatal_handler() {
$errline = $error["line"];
$errstr = $error["message"];
if ($errno != 8192) {
// do NOT log PHP Notice, Warning or Deprecated as FATAL
if ($errno & ~(E_NOTICE|E_WARNING|E_DEPRECATED)) {
ZLog::Write(LOGLEVEL_FATAL, sprintf("Fatal error: %s:%d - %s (%s)", $errfile, $errline, $errstr, $errno));
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment