harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into 'dev'

Browse Source 
Better photo cache expiry processing

See merge request hubzilla/core!1760
This commit is contained in:
Max Kostikov 2019-11-01 10:49:19 +01:00
commit 7594264725
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Zotlabs/Daemon/Cron.php
View File

@ -97,13 +97,14 @@ class Cron {
// Clean expired photos from cache // Clean expired photos from cache
$age = get_config('system','active_expire_days', '30'); $sql_interval = db_utcnow() . ' - INTERVAL ' . db_quoteinterval(get_config('system','active_expire_days', '30') . ' DAY');
$r = q("SELECT DISTINCT xchan, content FROM photo WHERE photo_usage = %d AND expires < %s - INTERVAL %s", $r = q("SELECT DISTINCT xchan, content FROM photo WHERE photo_usage = %d AND expires < $sql_interval",
intval(PHOTO_CACHE), intval(PHOTO_CACHE)
db_utcnow(),
db_quoteinterval($age . ' DAY')
); );
if($r) { if($r) {
q("DELETE FROM photo WHERE photo_usage = %d AND expires < $sql_interval",
intval(PHOTO_CACHE)
);
foreach($r as $rr) { foreach($r as $rr) {
$file = dbunescbin($rr['content']); $file = dbunescbin($rr['content']);
if(is_file($file)) { if(is_file($file)) {
@ -113,11 +114,6 @@ class Cron {
} }
} }
} }
q("DELETE FROM photo WHERE photo_usage = %d AND expires < %s - INTERVAL %s",
intval(PHOTO_CACHE),
db_utcnow(),
db_quoteinterval($age . ' DAY')
);
// publish any applicable items that were set to be published in the future // publish any applicable items that were set to be published in the future
// (time travel posts). Restrict to items that have come of age in the last // (time travel posts). Restrict to items that have come of age in the last