From ad42890a0b32f612a2161366ad63ef0759de84da Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Wed, 20 Jan 2021 22:15:01 +0100 Subject: Swap key and cat for running pid tracking --- Zotlabs/Daemon/Expire.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Zotlabs/Daemon/Expire.php b/Zotlabs/Daemon/Expire.php index 8ca92b6c5..c4ff8aec6 100644 --- a/Zotlabs/Daemon/Expire.php +++ b/Zotlabs/Daemon/Expire.php @@ -9,14 +9,14 @@ class Expire { cli_startup(); - $pid = get_config('expire', 'procid', false); + $pid = get_config('procid', 'expire', false); if ($pid && (function_exists('posix_kill') ? posix_kill($pid, 0) : true)) { - logger('Expire: procedure already run with pid ' . $pid, LOGGER_DEBUG); + logger('procedure already run with pid ' . $pid, LOGGER_DEBUG); return; } $pid = getmypid(); - set_config('expire', 'procid', $pid); + set_config('procid', 'expire', $pid); // perform final cleanup on previously delete items @@ -101,6 +101,6 @@ class Expire { logger('Expire: sys: done', LOGGER_DEBUG); } - del_config('expire', 'procid'); + del_config('procid', 'expire'); } } -- cgit v1.2.3 From 491dffd9b734c1f7aa879cca6e48eae5dc7b3f03 Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Wed, 20 Jan 2021 22:18:27 +0100 Subject: Implement SQL query background caching --- Zotlabs/Daemon/Cache_query.php | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 Zotlabs/Daemon/Cache_query.php diff --git a/Zotlabs/Daemon/Cache_query.php b/Zotlabs/Daemon/Cache_query.php new file mode 100644 index 000000000..c709c96b5 --- /dev/null +++ b/Zotlabs/Daemon/Cache_query.php @@ -0,0 +1,34 @@ + Date: Wed, 20 Jan 2021 22:24:00 +0100 Subject: Process public tags cloud in background --- include/taxonomy.php | 50 ++++++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/include/taxonomy.php b/include/taxonomy.php index e06568d19..5681db88c 100644 --- a/include/taxonomy.php +++ b/include/taxonomy.php @@ -354,30 +354,32 @@ function pub_tagadelic($net,$site,$limit,$recent,$safemode,$type) { $sql_extra .= " and not term.term in ( " . stringify_array($unsafetags,true) . ") "; } } - - - $key = __FUNCTION__ . "-" . md5($site . $recent . $safemode . $limit . $type); - $content = Cache::get($key, '1 MINUTE'); - - if(! $content) { - // Fetch tags - $r = q("SELECT term, count(term) AS total FROM term LEFT JOIN item ON term.oid = item.id - where term.ttype = %d - and otype = %d and item_type = %d - $sql_extra $uids $item_normal - group by term order by total desc %s", - intval($type), - intval(TERM_OBJ_POST), - intval(ITEM_TYPE_POST), - ((intval($count)) ? "limit $count" : '') - ); - } else - $r = unserialize($content); - - if(! $r) - return array(); - else - Cache::set($key, serialize($r)); + + $key = __FUNCTION__ . "-" . md5($site . $recent . $safemode . $limit . $type); + + $content = Cache::get($key, '1 MINUTE'); + if(! $content) { + + $content = Cache::get($key, '1 WEEK'); + $arr = [ + "SELECT term, count(term) AS total FROM term LEFT JOIN item ON term.oid = item.id + WHERE term.ttype = %d + AND otype = %d + AND item_type = %d + $sql_extra $uids $item_normal + GROUP BY term ORDER BY total DESC %s", + intval($type), + intval(TERM_OBJ_POST), + intval(ITEM_TYPE_POST), + (intval($count) ? "LIMIT $count" : '') + ]; + + \Zotlabs\Daemon\Master::Summon([ 'Cache_query', $key, $arr ]); + } + + $r = unserialize($content); + if(! $r) + return []; return Zotlabs\Text\Tagadelic::calc($r); } -- cgit v1.2.3 From 8134e9cae0ebdb551db7d044f8bd5558ca6903cd Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Wed, 20 Jan 2021 22:28:38 +0100 Subject: Process channel categories list in background --- include/contact_widgets.php | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/include/contact_widgets.php b/include/contact_widgets.php index 3b22a3c6d..0719d4011 100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -71,35 +71,39 @@ function categories_widget($baseurl,$selected = '') { $item_normal = item_normal(); - $key = __FUNCTION__ . "-" . App::$profile['profile_uid']; - $content = Cache::get($key, '5 MINUTE'); + $key = __FUNCTION__ . "-" . App::$profile['profile_uid']; + $content = Cache::get($key, '5 MINUTE'); if (! $content) { - $r = q("select distinct(term.term) from term join item on term.oid = item.id - where item.uid = %d - and term.uid = item.uid - and term.ttype = %d - and term.otype = %d - and item.owner_xchan = '%s' - and item.item_wall = 1 - and item.verb != '%s' + + $content = Cache::get($key, '1 MONTH'); + + $arr = [ + "SELECT distinct(term.term) FROM term JOIN item ON term.oid = item.id + WHERE item.uid = %d + AND term.uid = item.uid + AND term.ttype = %d + AND term.otype = %d + AND item.owner_xchan = '%s' + AND item.item_wall = 1 + AND item.verb != '%s' $item_normal $sql_extra - order by term.term asc", + ORDER BY term.term ASC", intval(App::$profile['profile_uid']), intval(TERM_CATEGORY), intval(TERM_OBJ_POST), dbesc(App::$profile['channel_hash']), dbesc(ACTIVITY_UPDATE) - ); + ]; + + \Zotlabs\Daemon\Master::Summon([ 'Cache_query', $key, $arr ]); } - else - $r = unserialize($content); - $terms = array(); - if($r && count($r)) { + $r = unserialize($content); - Cache::set($key, serialize($r)); + $terms = []; + if($r && count($r)) { foreach($r as $rr) $terms[] = array('name' => $rr['term'], 'selected' => (($selected == $rr['term']) ? 'selected' : '')); -- cgit v1.2.3 From 28ae78c579d9423f81f89443c50aa240609fb8f3 Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Thu, 21 Jan 2021 08:16:15 +0100 Subject: Higher log level --- Zotlabs/Daemon/Cache_query.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zotlabs/Daemon/Cache_query.php b/Zotlabs/Daemon/Cache_query.php index c709c96b5..18d19cdf2 100644 --- a/Zotlabs/Daemon/Cache_query.php +++ b/Zotlabs/Daemon/Cache_query.php @@ -15,7 +15,7 @@ class Cache_query { $pid = get_config('procid', $key, false); if ($pid && (function_exists('posix_kill') ? posix_kill($pid, 0) : true)) { - logger($key . ': procedure already run with pid ' . $pid); + logger($key . ': procedure already run with pid ' . $pid, LOGGER_DEBUG); return; } -- cgit v1.2.3 From 893847c649a9f3eb99cbaa8fc3bb795bc3184b7a Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Sat, 23 Jan 2021 13:58:05 +0100 Subject: Fix duplicate profile photos creation for clones --- Zotlabs/Lib/Libzot.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Zotlabs/Lib/Libzot.php b/Zotlabs/Lib/Libzot.php index 8847f0975..150a6af03 100644 --- a/Zotlabs/Lib/Libzot.php +++ b/Zotlabs/Lib/Libzot.php @@ -667,9 +667,8 @@ class Libzot { $arr['connect_url'] = ''; if ($r) { - if ($arr['photo'] && array_key_exists('updated', $arr['photo']) && $r[0]['xchan_photo_date'] != $arr['photo']['updated']) { + if ($arr['photo'] && array_key_exists('updated', $arr['photo']) && $arr['photo']['updated'] > $r[0]['xchan_photo_date']) $import_photos = true; - } // if we import an entry from a site that's not ours and either or both of us is off the grid - hide the entry. /** @TODO: check if we're the same directory realm, which would mean we are allowed to see it */ -- cgit v1.2.3 From 33951dc1e4695bece701b85275d4c282c1936150 Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Sat, 23 Jan 2021 14:00:38 +0100 Subject: Remove duplicated profile photos --- Zotlabs/Update/_1241.php | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 Zotlabs/Update/_1241.php diff --git a/Zotlabs/Update/_1241.php b/Zotlabs/Update/_1241.php new file mode 100644 index 000000000..1b2024aad --- /dev/null +++ b/Zotlabs/Update/_1241.php @@ -0,0 +1,24 @@ +