diff options
| author | Evan Prodromou <evan@status.net> | 2010-01-12 23:25:25 -0800 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-01-12 23:25:25 -0800 |
| commit | e34ece8b0630394b606b57b19de58c830fad9c4d (patch) | |
| tree | d6354a6e02517dd75c32f40b1d08a4b9cffd9b11 /lib/default.php | |
| parent | 392bc728c795dd50e19a56cb097ab9a64f129573 (diff) | |
| parent | ec145b73fc91dd54695dd374c8a71a11e233b8c0 (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/', |