summaryrefslogtreecommitdiff
path: root/lib/default.php
diff options
context:
space:
mode:
authorSiebrand Mazeland <s.mazeland@xs4all.nl>2010-01-13 23:10:00 +0100
committerSiebrand Mazeland <s.mazeland@xs4all.nl>2010-01-13 23:10:00 +0100
commit108c51fa6859ec56269078ef9bd0459fdbd9b1ba (patch)
treec45dc1036d80ba0fdc58473819cde12bcc03eb32 /lib/default.php
parentf7f82982ec9a8671195efdc278c2987aa92c083c (diff)
parent25ed2d2c872e59fd99b54fdf0dec1ca448feca00 (diff)
Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x
Diffstat (limited to 'lib/default.php')
-rw-r--r--lib/default.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/default.php b/lib/default.php
index fa862f3ff..f7f4777a2 100644
--- a/lib/default.php
+++ b/lib/default.php
@@ -79,6 +79,8 @@ $default =
'queue_basename' => '/queue/statusnet/',
'stomp_username' => null,
'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
),
'license' =>
array('url' => 'http://creativecommons.org/licenses/by/3.0/',