aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kostikov <max@kostikov.co>2019-11-01 10:34:02 +0100
committerMax Kostikov <max@kostikov.co>2019-11-01 10:34:02 +0100
commit9fac43a3a3f1993e4ffaa543da6a6b3e175fc7f4 (patch)
tree3b3b2ea9b78304aa6762892c87f6959ee7f7adc1
parent6f2a5842795c94a16bad089cb6ad5c9e2a74f480 (diff)
downloadvolse-hubzilla-9fac43a3a3f1993e4ffaa543da6a6b3e175fc7f4.tar.gz
volse-hubzilla-9fac43a3a3f1993e4ffaa543da6a6b3e175fc7f4.tar.bz2
volse-hubzilla-9fac43a3a3f1993e4ffaa543da6a6b3e175fc7f4.zip
Better photo cache expiry processing
-rw-r--r--Zotlabs/Daemon/Cron.php16
1 files changed, 6 insertions, 10 deletions
diff --git a/Zotlabs/Daemon/Cron.php b/Zotlabs/Daemon/Cron.php
index a08d2b7d2..94d2b634f 100644
--- a/Zotlabs/Daemon/Cron.php
+++ b/Zotlabs/Daemon/Cron.php
@@ -97,13 +97,14 @@ class Cron {
// Clean expired photos from cache
- $age = get_config('system','active_expire_days', '30');
- $r = q("SELECT DISTINCT xchan, content FROM photo WHERE photo_usage = %d AND expires < %s - INTERVAL %s",
- intval(PHOTO_CACHE),
- db_utcnow(),
- db_quoteinterval($age . ' DAY')
+ $sql_interval = db_utcnow() . ' - ' . db_quoteinterval(get_config('system','active_expire_days', '30') . ' DAY');
+ $r = q("SELECT DISTINCT xchan, content FROM photo WHERE photo_usage = %d AND expires < $sql_interval",
+ intval(PHOTO_CACHE)
);
if($r) {
+ q("DELETE FROM photo WHERE photo_usage = %d AND expires < $sql_interval",
+ intval(PHOTO_CACHE)
+ );
foreach($r as $rr) {
$file = dbunescbin($rr['content']);
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
// (time travel posts). Restrict to items that have come of age in the last