extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-18 03:11:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

refractored our exception handler a bit, to allow using part of it from ajax too. Ajax logs now the exception to the error_log and only shows a trace to the user if enabled in the config, like the rest of EGroupware

Browse Source
This commit is contained in:
Ralf Becker 2010-01-14 23:50:06 +00:00
parent 89311a8e7f
commit 8b2fe41fe0
2 changed files with 43 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
phpgwapi/inc/common_functions.inc.php
View File

@ -1422,13 +1422,12 @@ function __autoload($class)
} }
/** /**
* Fail a little bit more gracefully then an uncought exception * Clasify exception for a headline and log it to error_log, if not running as cli
* *
* Does NOT return
*
* @param Exception $e * @param Exception $e
* @param string &$headline
*/ */
function egw_exception_handler(Exception $e) function _egw_log_exception(Exception $e,&$headline=null)
{ {
if ($e instanceof egw_exception_no_permission) if ($e instanceof egw_exception_no_permission)
{ {
@ -1446,6 +1445,29 @@ function egw_exception_handler(Exception $e)
{ {
$headline = try_lang('An error happened'); $headline = try_lang('An error happened');
} }
// log exception to error log, if not running as cli,
// which outputs the error_log to stderr and therefore output it twice to the user
if(!isset($_SERVER['HTTP_HOST']) || $GLOBALS['egw_info']['flags']['no_exception_handler'] == 'cli')
{
error_log($headline.': '.$e->getMessage());
foreach(explode("\n",$e->getTraceAsString()) as $line) error_log($line);
error_log('# Instance='.$GLOBALS['egw_info']['user']['domain'].', User='.$GLOBALS['egw_info']['user']['account_lid'].', URL='.
($_SERVER['HTTPS']?'https://':'http://').$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);
}
}
/**
* Fail a little bit more gracefully then an uncought exception
*
* Does NOT return
*
* @param Exception $e
*/
function egw_exception_handler(Exception $e)
{
// logging all exceptions to the error_log (if not cli) and get headline
_egw_log_exception($e,$headline);
// exception handler for cli (command line interface) clients, no html, no logging // exception handler for cli (command line interface) clients, no html, no logging
if(!isset($_SERVER['HTTP_HOST']) || $GLOBALS['egw_info']['flags']['no_exception_handler'] == 'cli') if(!isset($_SERVER['HTTP_HOST']) || $GLOBALS['egw_info']['flags']['no_exception_handler'] == 'cli')
{ {
@ -1456,12 +1478,6 @@ function egw_exception_handler(Exception $e)
} }
exit($e->getCode() ? $e->getCode() : 9999); // allways give a non-zero exit code exit($e->getCode() ? $e->getCode() : 9999); // allways give a non-zero exit code
} }
// logging all exceptions to the error_log
error_log($headline.': '.$e->getMessage());
foreach(explode("\n",$e->getTraceAsString()) as $line) error_log($line);
error_log('# Instance='.$GLOBALS['egw_info']['user']['domain'].', User='.$GLOBALS['egw_info']['user']['account_lid'].', URL='.
($_SERVER['HTTPS']?'https://':'http://').$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);
// regular GUI exception // regular GUI exception
if (!isset($GLOBALS['egw_info']['flags']['no_exception_handler'])) if (!isset($GLOBALS['egw_info']['flags']['no_exception_handler']))
{ {
@ -1494,9 +1510,9 @@ function egw_exception_handler(Exception $e)
header('HTTP/1.1 401 Unauthorized'); header('HTTP/1.1 401 Unauthorized');
header('X-WebDAV-Status: 401 Unauthorized', true); header('X-WebDAV-Status: 401 Unauthorized', true);
} }
if (is_object($GLOBALS['egw']) && isset($GLOBALS['egw']->common)) if (is_object($GLOBALS['egw']))
{ {
$GLOBALS['egw']->common->egw_exit(); common::egw_exit();
} }
exit; exit;
} }

16
xajax.php
View File

@ -33,7 +33,7 @@ function xajax_redirect(&$anon_account)
} }
/** /**
* Exception handler for xajax, return the message (and trace) as alert() to the user * Exception handler for xajax, return the message (and trace, if enabled) as alert() to the user
* *
* Does NOT return! * Does NOT return!
* *
@ -41,8 +41,20 @@ function xajax_redirect(&$anon_account)
*/ */
function ajax_exception_handler(Exception $e) function ajax_exception_handler(Exception $e)
{ {
// logging all exceptions to the error_log
if (function_exists('_egw_log_exception'))
{
_egw_log_exception($e,$message);
}
$response = new xajaxResponse(); $response = new xajaxResponse();
$response->addAlert($e->getMessage()."\n\n".$e->getTraceAsString()); $message .= ($message ? "\n\n" : '').$e->getMessage();
// only show trace (incl. function arguments) if explicitly enabled, eg. on a development system
if ($GLOBALS['egw_info']['server']['exception_show_trace'])
{
$message .= "\n\n".$e->getTraceAsString();
}
$response->addAlert($message);
$response->printOutput(); $response->printOutput();
if (is_object($GLOBALS['egw'])) if (is_object($GLOBALS['egw']))