Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x

2010-02-12 11:18:35 -08:00
parent 3c79448cd8 fd3c9334bf
commit 122c8677b7
45 changed files with 3007 additions and 581 deletions
--- a/lib/default.php
+++ b/lib/default.php
@@ -88,6 +88,7 @@ $default =
              'stomp_manual_failover' => true, // if multiple servers are listed, treat them as separate (enqueue on one randomly, listen on all)
              '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
+              'spawndelay' => 1, // Wait at least N seconds between (re)spawns of child processes to avoid slamming the queue server with subscription startup
              'debug_memory' => false, // true to spit memory usage to log
              'inboxes' => true, // true to do inbox distribution & output queueing from in background via 'distrib' queue
              ),