X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=classes%2FQueue_item.php;h=d17e512b965646d62ac7ee98c0107912531139fb;hb=41dc9ca497dd065d72440cb2c706038f191a2c0c;hp=9c673540d746a6a25d55a62ba6fffbe8d8b17b46;hpb=e53512cd2c2180f81fc7317de9df09a140099aa3;p=quix0rs-gnu-social.git

diff --git a/classes/Queue_item.php b/classes/Queue_item.php
index 9c673540d7..d17e512b96 100644
--- a/classes/Queue_item.php
+++ b/classes/Queue_item.php
@@ -10,8 +10,8 @@ class Queue_item extends Memcached_DataObject
     /* the code below is auto generated do not remove the above tag */
 
     public $__table = 'queue_item';                      // table name
-    public $notice_id;                       // int(4)  primary_key not_null
-    public $transport;                       // varchar(8)  primary_key not_null
+    public $id;                              // int(4)  primary_key not_null
+    public $frame;                           // blob not_null
     public $created;                         // datetime()   not_null
     public $claimed;                         // datetime()
 
@@ -22,13 +22,22 @@ class Queue_item extends Memcached_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
-    function sequenceKey()
-    { return array(false, false); }
-
-    static function top($transport) {
+    /**
+     * @param mixed $transports name of a single queue or array of queues to pull from
+     *                          If not specified, checks all queues in the system.
+     */
+    static function top($transports=null) {
 
         $qi = new Queue_item();
-        $qi->transport = $transport;
+        if ($transports) {
+            if (is_array($transports)) {
+                // @fixme use safer escaping
+                $list = implode("','", array_map(array($qi, 'escape'), $transports));
+                $qi->whereAdd("transport in ('$list')");
+            } else {
+                $qi->transport = $transports;
+            }
+        }
         $qi->orderBy('created');
         $qi->whereAdd('claimed is null');
 
@@ -37,10 +46,11 @@ class Queue_item extends Memcached_DataObject
         $cnt = $qi->find(true);
 
         if ($cnt) {
-            # XXX: potential race condition
-            # can we force it to only update if claimed is still null
-            # (or old)?
-            common_log(LOG_INFO, 'claiming queue item = ' . $qi->notice_id . ' for transport ' . $transport);
+            // XXX: potential race condition
+            // can we force it to only update if claimed is still null
+            // (or old)?
+            common_log(LOG_INFO, 'claiming queue item id = ' . $qi->id .
+                ' for transport ' . $qi->transport);
             $orig = clone($qi);
             $qi->claimed = common_sql_now();
             $result = $qi->update($orig);
@@ -55,8 +65,16 @@ class Queue_item extends Memcached_DataObject
         return null;
     }
 
-    function pkeyGet($kv)
+    /**
+     * Release a claimed item.
+     */
+    function releaseCLaim()
     {
-        return Memcached_DataObject::pkeyGet('Queue_item', $kv);
+        // DB_DataObject doesn't let us save nulls right now
+        $sql = sprintf("UPDATE queue_item SET claimed=NULL WHERE id=%d", $this->id);
+        $this->query($sql);
+
+        $this->claimed = null;
+        $this->encache();
     }
 }