aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-07-06 22:02:06 -0700
committerredmatrix <git@macgirvin.com>2016-07-06 22:02:06 -0700
commit581a3c532303c008390a2851a1e42c6f5de390b1 (patch)
treece074f57b1aaf6aa168f6166a2e376e87d83aac7
parentad954d01de7568e2834907b4eb24f71648c3a01d (diff)
downloadvolse-hubzilla-581a3c532303c008390a2851a1e42c6f5de390b1.tar.gz
volse-hubzilla-581a3c532303c008390a2851a1e42c6f5de390b1.tar.bz2
volse-hubzilla-581a3c532303c008390a2851a1e42c6f5de390b1.zip
expire crashing on shared hosting from memory exhaustion. Lower the expire limit. Also the sys channel was being expired with everybody else due to a flag change regression.
-rw-r--r--Zotlabs/Daemon/Expire.php2
-rwxr-xr-xinclude/items.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Daemon/Expire.php b/Zotlabs/Daemon/Expire.php
index 0ba83b240..215513e87 100644
--- a/Zotlabs/Daemon/Expire.php
+++ b/Zotlabs/Daemon/Expire.php
@@ -38,7 +38,7 @@ class Expire {
logger('site_expire: ' . $site_expire);
- $r = q("SELECT channel_id, channel_address, channel_pageflags, channel_expire_days from channel where true");
+ $r = q("SELECT channel_id, channel_system, channel_address, channel_expire_days from channel where true");
if ($r) {
foreach ($r as $rr) {
diff --git a/include/items.php b/include/items.php
index 48358c0e4..fd0cfff32 100755
--- a/include/items.php
+++ b/include/items.php
@@ -3282,7 +3282,7 @@ function item_expire($uid,$days) {
$expire_limit = get_config('system','expire_limit');
if(! intval($expire_limit))
- $expire_limit = 5000;
+ $expire_limit = 2500;
$item_normal = item_normal();