Merge commit 'jeff-themovie/0.8.x-profile-value' into 0.8.x

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

diff --git a/lib/queuemanager.php b/lib/queuemanager.php
index 6bb21de9b602dd3d09428a7212f78d337f528b4c..582c247901a5902ce91c30a713e2c9a9750a4fba 100644 (file)
--- a/lib/queuemanager.php
+++ b/lib/queuemanager.php
@@ -39,27 +39,27 @@ class QueueManager
             if (Event::handle('StartNewQueueManager', array(&self::$qm))) {
 
                 $enabled = common_config('queue', 'enabled');
-                $type = common_config('queue', 'sub');
+                $type = common_config('queue', 'subsystem');
 
                 if (!$enabled) {
                     // does everything immediately
-                    return new UnQueueManager();
-                }
-
-                switch ($type) {
-                 case 'db':
-                    self::$qm = new DBQueueManager();
-                    break;
-                 case 'stomp':
-                    self::$qm = new StompQueueManager();
-                    break;
-                 default:
-                    throw new ServerException("No queue manager class for type '$type'");
+                    self::$qm = new UnQueueManager();
+                } else {
+                    switch ($type) {
+                     case 'db':
+                        self::$qm = new DBQueueManager();
+                        break;
+                     case 'stomp':
+                        self::$qm = new StompQueueManager();
+                        break;
+                     default:
+                        throw new ServerException("No queue manager class for type '$type'");
+                    }
                 }
             }
-
-            return self::$qm;
         }
+
+        return self::$qm;
     }
 
     function enqueue($object, $queue)
@@ -67,18 +67,8 @@ class QueueManager
         throw ServerException("Unimplemented function 'enqueue' called");
     }
 
-    function peek($queue)
-    {
-        throw ServerException("Unimplemented function 'peek' called");
-    }
-
-    function nextItem($queue, $timeout=null)
-    {
-        throw ServerException("Unimplemented function 'nextItem' called");
-    }
-
-    function done($object, $queue)
+    function service($queue, $handler)
     {
-        throw ServerException("Unimplemented function 'done' called");
+        throw ServerException("Unimplemented function 'service' called");
     }
 }