bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests 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
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/Model/Contact.php
View file

@ -91,6 +91,8 @@ class Contact
* @} * @}
*/ */
const LOCK_INSERT = 'contact-insert';
/** /**
* Account types * Account types
* *
@ -1125,19 +1127,23 @@ class Contact
$condition = ['nurl' => Strings::normaliseLink($data["url"]), 'uid' => $uid, 'deleted' => false]; $condition = ['nurl' => Strings::normaliseLink($data["url"]), 'uid' => $uid, 'deleted' => false];
// Before inserting we do check if the entry does exist now. // Before inserting we do check if the entry does exist now.
DBA::lock('contact'); if (DI::lock()->acquire(self::LOCK_INSERT, 0)) {
$contact = DBA::selectFirst('contact', ['id'], $condition, ['order' => ['id']]); $contact = DBA::selectFirst('contact', ['id'], $condition, ['order' => ['id']]);
if (DBA::isResult($contact)) { if (DBA::isResult($contact)) {
$contact_id = $contact['id']; $contact_id = $contact['id'];
Logger::notice('Contact had been created (shortly) before', ['id' => $contact_id, 'url' => $url, 'uid' => $uid]); Logger::notice('Contact had been created (shortly) before', ['id' => $contact_id, 'url' => $url, 'uid' => $uid]);
} else { } else {
DBA::insert('contact', $fields); DBA::insert('contact', $fields);
$contact_id = DBA::lastInsertId(); $contact_id = DBA::lastInsertId();
if ($contact_id) { if ($contact_id) {
Logger::info('Contact inserted', ['id' => $contact_id, 'url' => $url, 'uid' => $uid]); Logger::info('Contact inserted', ['id' => $contact_id, 'url' => $url, 'uid' => $uid]);
}
} }
DI::lock()->release(self::LOCK_INSERT);
} else {
Logger::warning('Contact lock had not been acquired');
} }
DBA::unlock();
if (!$contact_id) { if (!$contact_id) {
Logger::info('Contact was not inserted', ['url' => $url, 'uid' => $uid]); Logger::info('Contact was not inserted', ['url' => $url, 'uid' => $uid]);
return 0; return 0;

9
src/Model/Item.php
View file

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