keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #12562 from MrPetovan/bug/notices

Browse source 
Ward againt contact_id = 0 in UpdateContact worker
This commit is contained in:
Philipp 2023-01-02 00:34:21 +01:00 committed by GitHub
commit 4faf08c064
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 71 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/Model/Contact.php
View file

@ -47,6 +47,7 @@ use Friendica\Util\Images;
use Friendica\Util\Network;
use Friendica\Util\Proxy;
use Friendica\Util\Strings;
use Friendica\Worker\UpdateContact;
/**
* functions for interacting with a contact
@ -362,7 +363,11 @@ class Contact
// Update the contact in the background if needed
if ($background_update && !self::isLocal($url) && Probe::isProbable($contact['network']) && ($contact['next-update'] < DateTimeFormat::utcNow())) {
Worker::add(['priority' => Worker::PRIORITY_LOW, 'dont_fork' => true], 'UpdateContact', $contact['id']);
try {
UpdateContact::add(['priority' => Worker::PRIORITY_LOW, 'dont_fork' => true], $contact['id']);
} catch (\InvalidArgumentException $e) {
Logger::notice($e->getMessage(), ['contact' => $contact]);
}
}
// Remove the internal fields
@ -1276,7 +1281,11 @@ class Contact
$background_update = DI::config()->get('system', 'update_active_contacts') ? $contact['local-data'] : true;
if ($background_update && !self::isLocal($url) && Probe::isProbable($contact['network']) && ($contact['next-update'] < DateTimeFormat::utcNow())) {
Worker::add(['priority' => Worker::PRIORITY_LOW, 'dont_fork' => true], 'UpdateContact', $contact['id']);
try {
UpdateContact::add(['priority' => Worker::PRIORITY_LOW, 'dont_fork' => true], $contact['id']);
} catch (\InvalidArgumentException $e) {
Logger::notice($e->getMessage(), ['contact' => $contact]);
}
}
if (empty($update) && (!empty($contact['uri-id']) || is_bool($update))) {
@ -3078,7 +3087,11 @@ class Contact
if ($probed) {
self::updateFromProbeArray($contact_id, $ret);
} else {
Worker::add(Worker::PRIORITY_HIGH, 'UpdateContact', $contact_id);
try {
UpdateContact::add(Worker::PRIORITY_HIGH, $contact['id']);
} catch (\InvalidArgumentException $e) {
Logger::notice($e->getMessage(), ['contact' => $contact]);
}
}
$result['success'] = Protocol::follow($uid, $contact, $protocol);
@ -3549,8 +3562,12 @@ class Contact
Worker::add(Worker::PRIORITY_LOW, 'AddContact', 0, $url);
++$added;
} elseif (!empty($contact['network']) && Probe::isProbable($contact['network']) && ($contact['next-update'] < DateTimeFormat::utcNow())) {
Worker::add(['priority' => Worker::PRIORITY_LOW, 'dont_fork' => true], 'UpdateContact', $contact['id']);
try {
UpdateContact::add(['priority' => Worker::PRIORITY_LOW, 'dont_fork' => true], $contact['id']);
++$updated;
} catch (\InvalidArgumentException $e) {
Logger::notice($e->getMessage(), ['contact' => $contact]);
}
} else {
++$unchanged;
}

9
src/Module/Contact.php
View file

@ -26,8 +26,10 @@ use Friendica\Content\ContactSelector;
use Friendica\Content\Nav;
use Friendica\Content\Pager;
use Friendica\Content\Widget;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Core\Renderer;
use Friendica\Core\System;
use Friendica\Core\Theme;
use Friendica\Core\Worker;
use Friendica\Database\DBA;
@ -37,6 +39,7 @@ use Friendica\Model\User;
use Friendica\Module\Security\Login;
use Friendica\Network\HTTPException\InternalServerErrorException;
use Friendica\Network\HTTPException\NotFoundException;
use Friendica\Worker\UpdateContact;
/**
* Manages and show Contacts and their content
@ -129,7 +132,11 @@ class Contact extends BaseModule
// pull feed and consume it, which should subscribe to the hub.
Worker::add(Worker::PRIORITY_HIGH, 'OnePoll', $contact_id, 'force');
} else {
Worker::add(Worker::PRIORITY_HIGH, 'UpdateContact', $contact_id);
try {
UpdateContact::add(Worker::PRIORITY_HIGH, $contact_id);
} catch (\InvalidArgumentException $e) {
Logger::notice($e->getMessage(), ['contact' => $contact, 'callstack' => System::callstack()]);
}
}
}

7
src/Module/Photo.php
View file

@ -44,6 +44,7 @@ use Friendica\Util\Images;
use Friendica\Util\Network;
use Friendica\Util\ParseUrl;
use Friendica\Util\Proxy;
use Friendica\Worker\UpdateContact;
/**
* Photo Module
@ -351,8 +352,12 @@ class Photo extends BaseModule
Logger::debug('Got return code for avatar', ['return code' => $curlResult->getReturnCode(), 'cid' => $id, 'url' => $contact['url'], 'avatar' => $url]);
}
if ($update) {
try {
UpdateContact::add(Worker::PRIORITY_LOW, $id);
Logger::info('Invalid file, contact update initiated', ['cid' => $id, 'url' => $contact['url'], 'avatar' => $url]);
Worker::add(Worker::PRIORITY_LOW, 'UpdateContact', $id);
} catch (\InvalidArgumentException $e) {
Logger::notice($e->getMessage(), ['id' => $id, 'contact' => $contact]);
}
} else {
Logger::info('Invalid file', ['cid' => $id, 'url' => $contact['url'], 'avatar' => $url]);
}

19
src/Worker/UpdateContact.php
View file

@ -22,7 +22,9 @@
namespace Friendica\Worker;
use Friendica\Core\Logger;
use Friendica\Core\Worker;
use Friendica\Model\Contact;
use Friendica\Network\HTTPException\InternalServerErrorException;
class UpdateContact
{
@ -31,6 +33,8 @@ class UpdateContact
*
* @param int $contact_id Contact ID
* @return void
* @throws InternalServerErrorException
* @throws \ImagickException
*/
public static function execute(int $contact_id)
{
@ -38,4 +42,19 @@ class UpdateContact
Logger::info('Updated from probe', ['id' => $contact_id, 'success' => $success]);
}
/**
* @param array|int $run_parameters Priority constant or array of options described in Worker::add
* @param int $contact_id
* @return int
* @throws InternalServerErrorException
*/
public static function add($run_parameters, int $contact_id): int
{
if (!$contact_id) {
throw new \InvalidArgumentException('Invalid value provided for contact_id');
}
return Worker::add($run_parameters, 'UpdateContact', $contact_id);
}
}

8
src/Worker/UpdateContacts.php
View file

@ -63,15 +63,21 @@ class UpdateContacts
if (Contact::isLocal($contact['url'])) {
continue;
}
try {
if ((!empty($contact['gsid']) || !empty($contact['baseurl'])) && GServer::reachable($contact)) {
$stamp = (float)microtime(true);
$success = Contact::updateFromProbe($contact['id']);
Logger::debug('Direct update', ['id' => $contact['id'], 'count' => $count, 'duration' => round((float)microtime(true) - $stamp, 3), 'success' => $success]);
++$count;
} elseif (Worker::add(['priority' => Worker::PRIORITY_LOW, 'dont_fork' => true], 'UpdateContact', $contact['id'])) {
} elseif (UpdateContact::add(['priority' => Worker::PRIORITY_LOW, 'dont_fork' => true], $contact['id'])) {
Logger::debug('Update by worker', ['id' => $contact['id'], 'count' => $count]);
++$count;
}
} catch (\InvalidArgumentException $e) {
Logger::notice($e->getMessage(), ['contact' => $contact]);
}
Worker::coolDown();
}
DBA::close($contacts);