X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=classes%2FQueue_item.php;h=8a2cc87da355b4896bf42e2a6a6463d6b9e8d688;hb=ac09bc0a792ea5eaf324f3f03a1f143604f3b4b9;hp=d17e512b965646d62ac7ee98c0107912531139fb;hpb=87d46e1ae5e5effcc985021ff5af3f10815f3d3c;p=quix0rs-gnu-social.git

diff --git a/classes/Queue_item.php b/classes/Queue_item.php
index d17e512b96..8a2cc87da3 100644
--- a/classes/Queue_item.php
+++ b/classes/Queue_item.php
@@ -4,7 +4,7 @@
  */
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class Queue_item extends Memcached_DataObject
+class Queue_item extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -12,21 +12,35 @@ class Queue_item extends Memcached_DataObject
     public $__table = 'queue_item';                      // table name
     public $id;                              // int(4)  primary_key not_null
     public $frame;                           // blob not_null
+    public $transport;                       // varchar(32)
     public $created;                         // datetime()   not_null
     public $claimed;                         // datetime()
 
-    /* Static get */
-    function staticGet($k,$v=null)
-    { return Memcached_DataObject::staticGet('Queue_item',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
+    public static function schemaDef()
+    {
+        return array(
+            'fields' => array(
+                'id' => array('type' => 'serial', 'not null' => true, 'description' => 'unique identifier'),
+                'frame' => array('type' => 'blob', 'not null' => true, 'description' => 'data: object reference or opaque string'),
+                'transport' => array('type' => 'varchar', 'length' => 32, 'not null' => true, 'description' => 'queue for what? "email", "xmpp", "sms", "irc", ...'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'claimed' => array('type' => 'datetime', 'description' => 'date this item was claimed'),
+            ),
+            'primary key' => array('id'),
+            'indexes' => array(
+                'queue_item_created_idx' => array('created'),
+            ),
+        );
+    }
+
     /**
      * @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) {
+    static function top($transports=null, array $ignored_transports=array()) {
 
         $qi = new Queue_item();
         if ($transports) {
@@ -38,6 +52,11 @@ class Queue_item extends Memcached_DataObject
                 $qi->transport = $transports;
             }
         }
+        if (!empty($ignored_transports)) {
+            // @fixme use safer escaping
+            $list = implode("','", array_map(array($qi, 'escape'), $ignored_transports));
+            $qi->whereAdd("transport NOT IN ('$list')");
+        }
         $qi->orderBy('created');
         $qi->whereAdd('claimed is null');
 
@@ -49,16 +68,15 @@ class Queue_item extends Memcached_DataObject
             // 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);
+            common_log(LOG_INFO, 'claiming queue item id = ' . $qi->getID() . ' for transport ' . $qi->transport);
             $orig = clone($qi);
             $qi->claimed = common_sql_now();
             $result = $qi->update($orig);
             if ($result) {
-                common_log(LOG_INFO, 'claim succeeded.');
+                common_log(LOG_DEBUG, 'claim succeeded.');
                 return $qi;
             } else {
-                common_log(LOG_INFO, 'claim failed.');
+                common_log(LOG_ERR, 'claim of queue item id= ' . $qi->getID() . ' for transport ' . $qi->transport . ' failed.');
             }
         }
         $qi = null;
@@ -68,10 +86,10 @@ class Queue_item extends Memcached_DataObject
     /**
      * Release a claimed item.
      */
-    function releaseCLaim()
+    function releaseClaim()
     {
         // DB_DataObject doesn't let us save nulls right now
-        $sql = sprintf("UPDATE queue_item SET claimed=NULL WHERE id=%d", $this->id);
+        $sql = sprintf("UPDATE queue_item SET claimed=NULL WHERE id=%d", $this->getID());
         $this->query($sql);
 
         $this->claimed = null;