diff options
| author | Zach Copley <zach@status.net> | 2010-01-13 19:17:49 +0000 |
|---|---|---|
| committer | Zach Copley <zach@status.net> | 2010-01-13 19:17:49 +0000 |
| commit | c3188fd1fece2be7f7c4211d28f4a3d3a59c8fa1 (patch) | |
| tree | aa8018e132936b00fc63224e75ca134d68999b4e /lib/default.php | |
| parent | 43170b3d18153b3dfd8675bd77ae1133eed8148a (diff) | |
| parent | 0e1f2d4b47e5e340679c4245b62e1d64c6b9c9b9 (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.php | 2 |
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/', |