Adds an emergency switch so we can run inbox distribution at save time (bypassing...

Set $config['queue']['inboxes'] = false to do so

diff --git a/classes/Notice.php b/classes/Notice.php
index 0966697e215431f05724a047433397c76799490b..6b364fb5ced82c1acd438489f0bd038d25f75a63 100644 (file)
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -326,9 +326,13 @@ class Notice extends Memcached_DataObject
         # XXX: someone clever could prepend instead of clearing the cache
         $notice->blowOnInsert();
 
-        $qm = QueueManager::get();
-
-        $qm->enqueue($notice, 'distrib');
+        if (common_config('queue', 'inboxes')) {
+            $qm = QueueManager::get();
+            $qm->enqueue($notice, 'distrib');
+        } else {
+            $handler = new DistribQueueHandler();
+            $handler->handle($notice);
+        }
 
         return $notice;
     }

diff --git a/lib/default.php b/lib/default.php
index 10ea34864066b03a6ab5af2586be832ed4dbe11e..c729193b52b366bfa6bf2e891a842d49fc3a6665 100644 (file)
--- a/lib/default.php
+++ b/lib/default.php
@@ -87,6 +87,7 @@ $default =
               '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
+              'inboxes' => true, // true to do inbox distribution & output queueing from in background via 'distrib' queue
               ),
         'license' =>
         array('type' => 'cc', # can be 'cc', 'allrightsreserved', 'private'