GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Log backtraces for non-ClientException exceptions caught at the top-level handler.

Browse Source
This commit is contained in:
Brion Vibber 2010-03-22 11:33:56 -07:00
parent 3bb639699c
commit 4168b9cec1
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
index.php
View File

@ -324,10 +324,10 @@ function main()
$cac = new ClientErrorAction($cex->getMessage(), $cex->getCode()); $cac = new ClientErrorAction($cex->getMessage(), $cex->getCode());
$cac->showPage(); $cac->showPage();
} catch (ServerException $sex) { // snort snort guffaw } catch (ServerException $sex) { // snort snort guffaw
$sac = new ServerErrorAction($sex->getMessage(), $sex->getCode()); $sac = new ServerErrorAction($sex->getMessage(), $sex->getCode(), $sex);
$sac->showPage(); $sac->showPage();
} catch (Exception $ex) { } catch (Exception $ex) {
$sac = new ServerErrorAction($ex->getMessage()); $sac = new ServerErrorAction($ex->getMessage(), 500, $ex);
$sac->showPage(); $sac->showPage();
} }
} }

9
lib/servererroraction.php
View File

@ -62,15 +62,18 @@ class ServerErrorAction extends ErrorAction
504 => 'Gateway Timeout', 504 => 'Gateway Timeout',
505 => 'HTTP Version Not Supported'); 505 => 'HTTP Version Not Supported');
function __construct($message='Error', $code=500) function __construct($message='Error', $code=500, $ex=null)
{ {
parent::__construct($message, $code); parent::__construct($message, $code);
$this->default = 500; $this->default = 500;
// Server errors must be logged. // Server errors must be logged.
$log = "ServerErrorAction: $code $message";
common_log(LOG_ERR, "ServerErrorAction: $code $message"); if ($ex) {
$log .= "\n" . $ex->getTraceAsString();
}
common_log(LOG_ERR, $log);
} }
// XXX: Should these error actions even be invokable via URI? // XXX: Should these error actions even be invokable via URI?