mirror of
https://github.com/friendica/friendica
synced 2024-12-23 15:20:17 +00:00
Added lock for contacts, improved logging
This commit is contained in:
parent
930897046d
commit
da370c44ba
2 changed files with 22 additions and 15 deletions
|
@ -91,6 +91,8 @@ class Contact
|
||||||
* @}
|
* @}
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
const LOCK_INSERT = 'contact-insert';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Account types
|
* Account types
|
||||||
*
|
*
|
||||||
|
@ -1125,7 +1127,7 @@ 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'];
|
||||||
|
@ -1137,7 +1139,11 @@ class Contact
|
||||||
Logger::info('Contact inserted', ['id' => $contact_id, 'url' => $url, 'uid' => $uid]);
|
Logger::info('Contact inserted', ['id' => $contact_id, 'url' => $url, 'uid' => $uid]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
DBA::unlock();
|
DI::lock()->release(self::LOCK_INSERT);
|
||||||
|
} else {
|
||||||
|
Logger::warning('Contact lock had not been acquired');
|
||||||
|
}
|
||||||
|
|
||||||
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;
|
||||||
|
|
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue