aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2019-11-25 21:00:24 +0000
committerMario <mario@mariovavti.com>2019-11-25 21:00:24 +0000
commit3940fa5659eab185435d18eb07d1782566f1a549 (patch)
tree282a0bd69b0b31c5fbc039f3a85e65aab75d6538 /Zotlabs
parent0d47bb6878fc6920595b4252a54d76ba2486dabb (diff)
parent697fbf33c55ea6439b15eaa543366acdbd0b0d00 (diff)
downloadvolse-hubzilla-3940fa5659eab185435d18eb07d1782566f1a549.tar.gz
volse-hubzilla-3940fa5659eab185435d18eb07d1782566f1a549.tar.bz2
volse-hubzilla-3940fa5659eab185435d18eb07d1782566f1a549.zip
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Daemon/Cron_daily.php5
-rw-r--r--Zotlabs/Lib/Cache.php13
2 files changed, 9 insertions, 9 deletions
diff --git a/Zotlabs/Daemon/Cron_daily.php b/Zotlabs/Daemon/Cron_daily.php
index b41625963..452ef45f1 100644
--- a/Zotlabs/Daemon/Cron_daily.php
+++ b/Zotlabs/Daemon/Cron_daily.php
@@ -50,6 +50,11 @@ class Cron_daily {
dbesc('sse_id.%')
);
+ // Clean up emdedded content cache
+ q("DELETE FROM cache WHERE updated < %s - INTERVAL %s",
+ db_utcnow(),
+ db_quoteinterval(get_config('system','active_expire_days', '30') . ' DAY')
+ );
//update statistics in config
require_once('include/statistics_fns.php');
diff --git a/Zotlabs/Lib/Cache.php b/Zotlabs/Lib/Cache.php
index cea075659..878201a42 100644
--- a/Zotlabs/Lib/Cache.php
+++ b/Zotlabs/Lib/Cache.php
@@ -11,8 +11,10 @@ class Cache {
$hash = hash('whirlpool',$key);
- $r = q("SELECT v FROM cache WHERE k = '%s' limit 1",
- dbesc($hash)
+ $r = q("SELECT v FROM cache WHERE k = '%s' AND updated > %s - INTERVAL %s LIMIT 1",
+ dbesc($hash),
+ db_utcnow(),
+ db_quoteinterval(get_config('system','object_cache_days', '30') . ' DAY')
);
if ($r)
@@ -40,12 +42,5 @@ class Cache {
dbesc(datetime_convert()));
}
}
-
-
- public static function clear() {
- q("DELETE FROM cache WHERE updated < '%s'",
- dbesc(datetime_convert('UTC','UTC',"now - 30 days")));
- }
-
}