adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 09:06:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added usage of configured error handler instead of hard coded. Moved try/catch block to where its nessecary. Set Configure::write('Error.trace', false) since its useless with internals. Addition to #1707 .

Browse source
This commit is contained in:
Thomas Ploch 2011-05-17 08:44:55 +02:00
parent 1b14887e3a
commit d8a614e112
1 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
lib/Cake/Error/ErrorHandler.php
View file

@ -107,31 +107,32 @@ class ErrorHandler {
* @see http://php.net/manual/en/function.set-exception-handler.php * @see http://php.net/manual/en/function.set-exception-handler.php
*/ */
public static function handleException(Exception $exception) { public static function handleException(Exception $exception) {
$config = Configure::read('Exception');
if (!empty($config['log'])) {
$message = sprintf("[%s] %s\n%s",
get_class($exception),
$exception->getMessage(),
$exception->getTraceAsString()
);
CakeLog::write(LOG_ERR, $message);
}
$renderer = $config['renderer'];
if ($renderer !== 'ExceptionRenderer') {
list($plugin, $renderer) = pluginSplit($renderer, true);
App::uses($renderer, $plugin . 'Error');
}
try { try {
$config = Configure::read('Exception');
if (!empty($config['log'])) {
$message = sprintf("[%s] %s\n%s",
get_class($exception),
$exception->getMessage(),
$exception->getTraceAsString()
);
CakeLog::write(LOG_ERR, $message);
}
$renderer = $config['renderer'];
if ($renderer !== 'ExceptionRenderer') {
list($plugin, $renderer) = pluginSplit($renderer, true);
App::uses($renderer, $plugin . 'Error');
}
$error = new $renderer($exception); $error = new $renderer($exception);
$error->render(); $error->render();
} catch (Exception $e) { } catch (Exception $e) {
$message = $e->getMessage()."\nCall Stack:\n".$e->getTraceAsString(); set_error_handler(Configure::read('Error.handler')); // Should be using configured ErrorHandler
ErrorHandler::handleError( Configure::write('Error.trace', false); // trace is useless here since it's internal
E_ERROR, $message = sprintf("[%s] %s\n%s", // Keeping same message format
$message, get_class($e),
$e->getFile(), $e->getMessage(),
$e->getLine() $e->getTraceAsString()
); );
trigger_error($message, E_USER_ERROR);
} }
} }