From 427ac3a3a6eafa9a82006e9f0a9c2ab19a09fb4b Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 27 Jan 2010 20:51:04 -0800
Subject: debug log line for control channel sub

---
 lib/stompqueuemanager.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/stompqueuemanager.php')

diff --git a/lib/stompqueuemanager.php b/lib/stompqueuemanager.php
index 19e8c49b5..da70d9ae3 100644
--- a/lib/stompqueuemanager.php
+++ b/lib/stompqueuemanager.php
@@ -242,6 +242,7 @@ class StompQueueManager extends QueueManager
         parent::start($master);
         $this->_connect();
 
+        common_log(LOG_INFO, "Subscribing to $this->control");
         $this->con->subscribe($this->control);
         if ($this->sites) {
             foreach ($this->sites as $server) {
-- 
cgit v1.2.3-54-g00ecf


From a868a523a5ab042e75d333298a75aaa369d445cc Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 28 Jan 2010 09:52:35 -0800
Subject: Can now set $config['queue']['stomp_persistent'] = false; to
 explicitly disable persistence when we queue items

---
 lib/default.php           | 1 +
 lib/stompqueuemanager.php | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'lib/stompqueuemanager.php')

diff --git a/lib/default.php b/lib/default.php
index c729193b5..8de8b1097 100644
--- a/lib/default.php
+++ b/lib/default.php
@@ -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
diff --git a/lib/stompqueuemanager.php b/lib/stompqueuemanager.php
index da70d9ae3..4e2b58602 100644
--- a/lib/stompqueuemanager.php
+++ b/lib/stompqueuemanager.php
@@ -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");
-- 
cgit v1.2.3-54-g00ecf