From f134a423f6a9e7bb61d069c4d6281c05417bbd45 Mon Sep 17 00:00:00 2001
From: Mikael Nordfeldth <mmn@hethane.se>
Date: Sun, 27 Mar 2016 16:36:45 +0200
Subject: [PATCH] rename config option site/logdebug to log/debugtrace

---
 index.php       | 4 ++--
 lib/default.php | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/index.php b/index.php
index eef894effc..d96f2396e4 100644
--- a/index.php
+++ b/index.php
@@ -94,7 +94,7 @@ function handleError($error)
         }
 
         $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();
         }
         // 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);
 
         // @fixme backtrace output should be consistent with exception handling
-        if (common_config('site', 'logdebug')) {
+        if (common_config('log', 'debugtrace')) {
             $bt = $error->getTrace();
             foreach ($bt as $n => $line) {
                 common_log(LOG_ERR, formatBacktraceLine($n, $line));
diff --git a/lib/default.php b/lib/default.php
index 5c99d824dc..12e194f549 100644
--- a/lib/default.php
+++ b/lib/default.php
@@ -38,7 +38,6 @@ $default =
               'logfile' => null,
               'logo' => null,
               'ssllogo' => null,
-              'logdebug' => false,
               'logperf' => false, // Enable to dump performance counters to syslog
               'logperf_detail' => false, // Enable to dump every counter hit
               'fancy' => false,
@@ -85,6 +84,9 @@ $default =
         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
               ),
+        'log' => [
+                'debugtrace' => false,  // index.php handleError function, whether to include exception backtrace in log
+            ],
         'syslog' =>
         array('appname' => 'statusnet', # for syslog
               'priority' => 'debug', # XXX: currently ignored