diff options
author | Evan Prodromou <evan@status.net> | 2010-01-12 23:53:52 -0800 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2010-01-12 23:53:52 -0800 |
commit | 436b8c845ea8fcc84f7f2bff71a7fa700d262a01 (patch) | |
tree | e81b78c2022ca0770d71c3c3a7980d02a24a2a51 /classes/Queue_item.php | |
parent | fb0d837ddc572993f8c6d1db3de2c96d70101841 (diff) | |
parent | e34ece8b0630394b606b57b19de58c830fad9c4d (diff) |
Merge branch '0.9.x' into inblob
Diffstat (limited to 'classes/Queue_item.php')
-rw-r--r-- | classes/Queue_item.php | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/classes/Queue_item.php b/classes/Queue_item.php index 9c673540d..cf805a606 100644 --- a/classes/Queue_item.php +++ b/classes/Queue_item.php @@ -25,10 +25,12 @@ class Queue_item extends Memcached_DataObject function sequenceKey() { return array(false, false); } - static function top($transport) { + static function top($transport=null) { $qi = new Queue_item(); - $qi->transport = $transport; + if ($transport) { + $qi->transport = $transport; + } $qi->orderBy('created'); $qi->whereAdd('claimed is null'); @@ -40,7 +42,8 @@ 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 = ' . $qi->notice_id . ' for transport ' . $transport); + common_log(LOG_INFO, 'claiming queue item = ' . $qi->notice_id . + ' for transport ' . $qi->transport); $orig = clone($qi); $qi->claimed = common_sql_now(); $result = $qi->update($orig); |