better output for common error handler

This commit is contained in:
Evan Prodromou 2009-06-28 19:24:14 -04:00
parent 6557a569e5
commit 14575fe6fc

View File

@ -1348,18 +1348,39 @@ function common_canonical_sms($sms)
function common_error_handler($errno, $errstr, $errfile, $errline, $errcontext) function common_error_handler($errno, $errstr, $errfile, $errline, $errcontext)
{ {
switch ($errno) { switch ($errno) {
case E_ERROR:
case E_COMPILE_ERROR:
case E_CORE_ERROR:
case E_USER_ERROR: case E_USER_ERROR:
common_log(LOG_ERR, "[$errno] $errstr ($errfile:$errline)"); case E_PARSE:
exit(1); case E_RECOVERABLE_ERROR:
common_log(LOG_ERR, "[$errno] $errstr ($errfile:$errline) [ABORT]");
die();
break; break;
case E_WARNING:
case E_COMPILE_WARNING:
case E_CORE_WARNING:
case E_USER_WARNING: case E_USER_WARNING:
common_log(LOG_WARNING, "[$errno] $errstr ($errfile:$errline)"); common_log(LOG_WARNING, "[$errno] $errstr ($errfile:$errline)");
break; break;
case E_NOTICE:
case E_USER_NOTICE: case E_USER_NOTICE:
common_log(LOG_NOTICE, "[$errno] $errstr ($errfile:$errline)"); common_log(LOG_NOTICE, "[$errno] $errstr ($errfile:$errline)");
break; break;
case E_STRICT:
case E_DEPRECATED:
case E_USER_DEPRECATED:
// XXX: config variable to log this stuff, too
break;
default:
common_log(LOG_ERR, "[$errno] $errstr ($errfile:$errline) [UNKNOWN LEVEL, die()'ing]");
die();
break;
} }
// FIXME: show error page if we're on the Web // FIXME: show error page if we're on the Web