Return dynamically generated URLs for thumbnails for all locally stored entries

[quix0rs-gnu-social.git] / classes / Queue_item.php

diff --git a/classes/Queue_item.php b/classes/Queue_item.php
index c61c17deb5ed7c72d708ac99bb793d9fbfc8b7ef..8a2cc87da355b4896bf42e2a6a6463d6b9e8d688 100644 (file)
--- a/classes/Queue_item.php
+++ b/classes/Queue_item.php
@@ -12,6 +12,7 @@ class Queue_item extends Managed_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()
 
@@ -24,7 +25,7 @@ class Queue_item extends Managed_DataObject
             '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' => 8, 'not null' => true, 'description' => 'queue for what? "email", "xmpp", "sms", "irc", ...'), // @fixme 8 chars is too short; bump up.
+                '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'),
             ),
@@ -39,7 +40,7 @@ class Queue_item extends Managed_DataObject
      * @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) {
@@ -51,6 +52,11 @@ class Queue_item extends Managed_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');
 
@@ -62,16 +68,15 @@ class Queue_item extends Managed_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;
@@ -81,10 +86,10 @@ class Queue_item extends Managed_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;