GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch 'master' of git@gitorious.org:statusnet/mainline

This commit is contained in:
Sarven Capadisli 2010-01-28 19:37:31 +01:00
parent 171c97f17e a868a523a5
commit 86fed21c14
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/default.php
View File

@ -84,6 +84,7 @@ $default =
'control_channel' => '/topic/statusnet-control', // broadcasts to all queue daemons
'stomp_username' => null,
'stomp_password' => null,
'stomp_persistent' => true, // keep items across queue server restart, if persistence is enabled
'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
'debug_memory' => false, // true to spit memory usage to log

9
lib/stompqueuemanager.php
View File

@ -174,12 +174,13 @@ class StompQueueManager extends QueueManager
$this->_connect();
// XXX: serialize and send entire notice
$props = array('created' => common_sql_now());
if (common_config('queue', 'stomp_persistent')) {
$props['persistent'] = 'true';
}
$result = $this->con->send($this->queueName($queue),
$msg, // BODY of the message
array ('created' => common_sql_now(),
'persistent' => 'true'));
$props);
if (!$result) {
common_log(LOG_ERR, "Error sending $rep to $queue queue");