Alternative item insert lock mechanism

diff --git a/src/Model/Item.php b/src/Model/Item.php
index aea428cd72a22f0d58bcb51997180a3df9cad507..d5958312f30679f84d6f98c5c64a5ec290fa6e6e 100644 (file)
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -71,6 +71,8 @@ class Item
        const PT_FETCHED = 75;
        const PT_PERSONAL_NOTE = 128;
 
+       const LOCK_ITEM = 'item-insert';
+
        // Field list that is used to display the items
        const DISPLAY_FIELDLIST = [
                'uid', 'id', 'parent', 'uri-id', 'uri', 'thr-parent', 'parent-uri', 'guid', 'network', 'gravity',
@@ -1884,24 +1886,27 @@ class Item
                        }
                }
 
-               DBA::lock('item');
-
-               $condition = ['uri-id' => $item['uri-id'], 'uid' => $item['uid'], 'network' => $item['network']];
-               if (DBA::exists('item', $condition)) {
-                       DBA::unlock();
-                       Logger::notice('Item is already inserted - aborting', $condition);
-                       return 0;
-               }
+               if (DI::lock()->acquire(self::LOCK_ITEM, 0)) {
+                       $condition = ['uri-id' => $item['uri-id'], 'uid' => $item['uid'], 'network' => $item['network']];
+                       if (DBA::exists('item', $condition)) {
+                               DI::lock()->release(self::LOCK_ITEM);
+                               Logger::notice('Item is already inserted - aborting', $condition);
+                               return 0;
+                       }
 
-               $ret = DBA::insert('item', $item);
+                       $result = DBA::insert('item', $item);
 
-               // When the item was successfully stored we fetch the ID of the item.
-               $current_post = DBA::lastInsertId();
-               DBA::unlock();
+                       // When the item was successfully stored we fetch the ID of the item.
+                       $current_post = DBA::lastInsertId();
+                       DI::lock()->release(self::LOCK_ITEM);
+               } else {
+                       $result = false;
+                       $current_post = 0;
+               }
 
-               if (!DBA::isResult($ret) || ($current_post == 0)) {
+               if (empty($current_post) || !DBA::isResult($result)) {
                        // On failure store the data into a spool file so that the "SpoolPost" worker can try again later.
-                       Logger::warning('Could not store item. it will be spooled', ['ret' => $ret, 'id' => $current_post]);
+                       Logger::warning('Could not store item. it will be spooled', ['result' => $result, 'id' => $current_post]);
                        self::spool($orig_item);
                        return 0;
                }