diff options
author | Evan Prodromou <evan@status.net> | 2010-01-22 14:18:21 -0500 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2010-01-22 14:18:21 -0500 |
commit | 29d83c8ca94201cb010b5aef564df78ab868ea0c (patch) | |
tree | 8bc66e2fc03865e287a4c1907e766d6b4311c832 /lib/default.php | |
parent | 104d300799c0817bdbe893f08fd9b46d37a75a80 (diff) | |
parent | 0e852def6ae5aa529cca0aef1187152fb5a880be (diff) |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'lib/default.php')
-rw-r--r-- | lib/default.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/default.php b/lib/default.php index 5b2ae6c7c..0cb70de2d 100644 --- a/lib/default.php +++ b/lib/default.php @@ -67,7 +67,9 @@ $default = 'db_driver' => 'DB', # XXX: JanRain libs only work with DB 'quote_identifiers' => false, 'type' => 'mysql', - 'schemacheck' => 'runtime'), // 'runtime' or 'script' + 'schemacheck' => 'runtime', // 'runtime' or 'script' + 'log_queries' => false, // true to log all DB queries + 'log_slow_queries' => 0), // if set, log queries taking over N seconds 'syslog' => array('appname' => 'statusnet', # for syslog 'priority' => 'debug', # XXX: currently ignored @@ -81,6 +83,7 @@ $default = 'stomp_password' => null, 'monitor' => null, // URL to monitor ping endpoint (work in progress) 'softlimit' => '90%', // total size or % of memory_limit at which to restart queue threads gracefully + 'debug_memory' => false, // true to spit memory usage to log ), 'license' => array('type' => 'cc', # can be 'cc', 'allrightsreserved', 'private' |