eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

rename config option site/logdebug to log/debugtrace

Browse Source
This commit is contained in:
Mikael Nordfeldth 2016-03-27 16:36:45 +02:00
parent 97f7e6632d
commit f134a423f6
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
index.php
View File

@ -94,7 +94,7 @@ function handleError($error)
} }
$logmsg = "Exception thrown: " . _ve($error->getMessage()); $logmsg = "Exception thrown: " . _ve($error->getMessage());
if ($error instanceof PEAR_Exception && common_config('site', 'logdebug')) { if ($error instanceof PEAR_Exception && common_config('log', 'debugtrace')) {
$logmsg .= " PEAR: ". $error->toText(); $logmsg .= " PEAR: ". $error->toText();
} }
// DB queries often end up with a lot of newlines; merge to a single line // DB queries often end up with a lot of newlines; merge to a single line
@ -103,7 +103,7 @@ function handleError($error)
common_log(LOG_ERR, $logmsg); common_log(LOG_ERR, $logmsg);
// @fixme backtrace output should be consistent with exception handling // @fixme backtrace output should be consistent with exception handling
if (common_config('site', 'logdebug')) { if (common_config('log', 'debugtrace')) {
$bt = $error->getTrace(); $bt = $error->getTrace();
foreach ($bt as $n => $line) { foreach ($bt as $n => $line) {
common_log(LOG_ERR, formatBacktraceLine($n, $line)); common_log(LOG_ERR, formatBacktraceLine($n, $line));

4
lib/default.php
View File

@ -38,7 +38,6 @@ $default =
'logfile' => null, 'logfile' => null,
'logo' => null, 'logo' => null,
'ssllogo' => null, 'ssllogo' => null,
'logdebug' => false,
'logperf' => false, // Enable to dump performance counters to syslog 'logperf' => false, // Enable to dump performance counters to syslog
'logperf_detail' => false, // Enable to dump every counter hit 'logperf_detail' => false, // Enable to dump every counter hit
'fancy' => false, 'fancy' => false,
@ -85,6 +84,9 @@ $default =
array('fancyurls' => true, // makes sure aliases in WebFinger etc. are not f'd by index.php/ URLs array('fancyurls' => true, // makes sure aliases in WebFinger etc. are not f'd by index.php/ URLs
'legacy_http' => false, // set this to true if you have upgraded your site from http=>https 'legacy_http' => false, // set this to true if you have upgraded your site from http=>https
), ),
'log' => [
'debugtrace' => false, // index.php handleError function, whether to include exception backtrace in log
],
'syslog' => 'syslog' =>
array('appname' => 'statusnet', # for syslog array('appname' => 'statusnet', # for syslog
'priority' => 'debug', # XXX: currently ignored 'priority' => 'debug', # XXX: currently ignored