Merge branch 'master' into mmn_fixes

[quix0rs-gnu-social.git] / lib / queuemanager.php

diff --git a/lib/queuemanager.php b/lib/queuemanager.php
index 45fe1e4ab43040343989833046206622bfc2f72b..74e653e72e61ce575bde0ee692a5d6afbe6832e1 100644 (file)
--- a/lib/queuemanager.php
+++ b/lib/queuemanager.php
@@ -43,6 +43,7 @@ abstract class QueueManager extends IoManager
     protected $handlers = array();
     protected $groups = array();
     protected $activeGroups = array();
+    protected $ignoredTransports = array();
 
     /**
      * Factory function to pull the appropriate QueueManager object
@@ -234,7 +235,7 @@ abstract class QueueManager extends IoManager
                 $this->_log(LOG_ERR, "Nonexistent handler class '$class' for queue '$queue'");
             }
         }
-        return null;
+        throw new NoQueueHandlerException($queue);
     }
 
     /**
@@ -255,6 +256,17 @@ abstract class QueueManager extends IoManager
         return array_keys($queues);
     }
 
+    function getIgnoredTransports()
+    {
+        return array_keys($this->ignoredTransports);
+    }
+
+    function ignoreTransport($transport)
+    {
+        // key is used for uniqueness, value doesn't mean anything
+        $this->ignoredTransports[$transport] = true;
+    }
+
     /**
      * Initialize the list of queue handlers for the current site.
      *