diff options
| author | Brion Vibber <brion@pobox.com> | 2010-04-02 15:56:25 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-04-02 15:56:25 -0700 |
| commit | 2f4438fe24a99e5493469f734bf41547c8ad2ce5 (patch) | |
| tree | 71bd93323bb6d39696ea6d13d961d4395be59ee4 /lib/default.php | |
| parent | 01a03e34c8d286011c0f4301e60c103d992a449a (diff) | |
| parent | e4d934827bd7b2162e870611662549a5df759b57 (diff) | |
Merge branch '0.9.x' into 1.0.x
Conflicts:
actions/imsettings.php
lib/jabber.php
Made a quick attempt to merge the new JID validation into the XmppPlugin, have not had a chance to test that version live yet.
Should also move over the test cases.
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 745e8d850..7f9cd7eac 100644 --- a/lib/default.php +++ b/lib/default.php @@ -88,6 +88,8 @@ $default = 'stomp_username' => null, 'stomp_password' => null, 'stomp_persistent' => true, // keep items across queue server restart, if persistence is enabled + 'stomp_transactions' => true, // use STOMP transactions to aid in detecting failures (supported by ActiveMQ, but not by all) + 'stomp_acks' => true, // send acknowledgements after successful processing (supported by ActiveMQ, but not by all) '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 |