clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added lock for contacts, improved logging

Browse Source
This commit is contained in:
Michael
2020-10-30 17:26:12 +00:00
parent 930897046d
commit da370c44ba
2 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Model/Item.php
View File

@@ -71,7 +71,7 @@ class Item
const PT_FETCHED = 75;
const PT_PERSONAL_NOTE = 128;
const LOCK_ITEM = 'item-insert';
const LOCK_INSERT = 'item-insert';
// Field list that is used to display the items
const DISPLAY_FIELDLIST = [
@@ -1891,10 +1891,10 @@ class Item
}
}
if (DI::lock()->acquire(self::LOCK_ITEM, 0)) {
if (DI::lock()->acquire(self::LOCK_INSERT, 0)) {
$condition = ['uri-id' => $item['uri-id'], 'uid' => $item['uid'], 'network' => $item['network']];
if (DBA::exists('item', $condition)) {
DI::lock()->release(self::LOCK_ITEM);
DI::lock()->release(self::LOCK_INSERT);
Logger::notice('Item is already inserted - aborting', $condition);
return 0;
}
@@ -1903,8 +1903,9 @@ class Item
// When the item was successfully stored we fetch the ID of the item.
$current_post = DBA::lastInsertId();
DI::lock()->release(self::LOCK_ITEM);
DI::lock()->release(self::LOCK_INSERT);
} else {
Logger::warning('Item lock had not been acquired');
$result = false;
$current_post = 0;
}