tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Added comments / hourly workerqueue deletion

Browse source
This commit is contained in:
Michael 2018-05-15 17:50:29 +00:00
parent 3e475f3b82
commit fc60e23314
2 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Model/Item.php
View file

@ -117,10 +117,12 @@ class Item extends BaseObject
'verb', 'object-type', 'object', 'target', 'contact-id']; 'verb', 'object-type', 'object', 'target', 'contact-id'];
$item = dba::selectFirst('item', $fields, ['id' => $item_id]); $item = dba::selectFirst('item', $fields, ['id' => $item_id]);
if (!DBM::is_result($item)) { if (!DBM::is_result($item)) {
logger('Item with ID ' . $item_id . " hadn't been found.", LOGGER_DEBUG);
return false; return false;
} }
if ($item['deleted']) { if ($item['deleted']) {
logger('Item with ID ' . $item_id . ' is already deleted.', LOGGER_DEBUG);
return false; return false;
} }
@ -129,8 +131,6 @@ class Item extends BaseObject
$parent = ['origin' => false]; $parent = ['origin' => false];
} }
logger('delete item: ' . $item['id'], LOGGER_DEBUG);
// clean up categories and tags so they don't end up as orphans // clean up categories and tags so they don't end up as orphans
$matches = false; $matches = false;
@ -202,6 +202,8 @@ class Item extends BaseObject
Worker::add(['priority' => $priority, 'dont_fork' => true], "Notifier", "drop", intval($item['id'])); Worker::add(['priority' => $priority, 'dont_fork' => true], "Notifier", "drop", intval($item['id']));
} }
logger('Item with ID ' . $item_id . " had been deleted.", LOGGER_DEBUG);
return true; return true;
} }

16
src/Worker/Cron.php
View file

@ -74,6 +74,7 @@ Class Cron {
$d1 = Config::get('system', 'last_expire_day'); $d1 = Config::get('system', 'last_expire_day');
$d2 = intval(DateTimeFormat::utcNow('d')); $d2 = intval(DateTimeFormat::utcNow('d'));
// Daily cron calls
if ($d2 != intval($d1)) { if ($d2 != intval($d1)) {
Worker::add(PRIORITY_LOW, "CronJobs", "update_contact_birthdays"); Worker::add(PRIORITY_LOW, "CronJobs", "update_contact_birthdays");
@ -90,13 +91,22 @@ Class Cron {
Worker::add(PRIORITY_LOW, "CronJobs", "update_photo_albums"); Worker::add(PRIORITY_LOW, "CronJobs", "update_photo_albums");
// Delete all done workerqueue entries
dba::delete('workerqueue', ['`done` AND `executed` < UTC_TIMESTAMP() - INTERVAL 12 HOUR']);
// check upstream version? // check upstream version?
Worker::add(PRIORITY_LOW, 'CheckVersion'); Worker::add(PRIORITY_LOW, 'CheckVersion');
} }
// Hourly cron calls
if (Config::get('system', 'last_cron_hourly', 0) + 3600 < time()) {
// Delete all done workerqueue entries
dba::delete('workerqueue', ['`done` AND `executed` < UTC_TIMESTAMP() - INTERVAL 1 HOUR']);
// Optimizing this table only last seconds
dba::e("OPTIMIZE TABLE `workerqueue`");
Config::set('system', 'last_cron_hourly', time());
}
// Poll contacts // Poll contacts
self::pollContacts($parameter, $generation); self::pollContacts($parameter, $generation);