diff options
| author | zotlabs <mike@macgirvin.com> | 2017-11-12 21:36:25 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-11-12 21:37:06 -0800 |
| commit | b12dc89bb1fbdc29f82fffee3587360d618ef603 (patch) | |
| tree | 40ab4897aa583dcf2627b6d139f4facaa99ac547 /Zotlabs | |
| parent | a387868540e931a77e0af9ce706047f40feef021 (diff) | |
| download | volse-hubzilla-b12dc89bb1fbdc29f82fffee3587360d618ef603.tar.gz volse-hubzilla-b12dc89bb1fbdc29f82fffee3587360d618ef603.tar.bz2 volse-hubzilla-b12dc89bb1fbdc29f82fffee3587360d618ef603.zip | |
improve removed_channel final cleanup. Hubzilla issue #386
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Daemon/Cron.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Daemon/Cron_weekly.php | 15 |
2 files changed, 16 insertions, 1 deletions
diff --git a/Zotlabs/Daemon/Cron.php b/Zotlabs/Daemon/Cron.php index 65edbedfa..01c43262a 100644 --- a/Zotlabs/Daemon/Cron.php +++ b/Zotlabs/Daemon/Cron.php @@ -78,7 +78,7 @@ class Cron { // channels and sites that quietly vanished and prevent the directory from accumulating stale // or dead entries. - $r = q("select channel_id from channel where channel_dirdate < %s - INTERVAL %s", + $r = q("select channel_id from channel where channel_dirdate < %s - INTERVAL %s and channel_removed = 0", db_utcnow(), db_quoteinterval('30 DAY') ); diff --git a/Zotlabs/Daemon/Cron_weekly.php b/Zotlabs/Daemon/Cron_weekly.php index 5b185f475..d44400767 100644 --- a/Zotlabs/Daemon/Cron_weekly.php +++ b/Zotlabs/Daemon/Cron_weekly.php @@ -21,6 +21,21 @@ class Cron_weekly { mark_orphan_hubsxchans(); + // Find channels that were removed in the last three weeks, but + // haven't been finally cleaned up. These should be older than 10 + // days to ensure that "purgeall" messages have gone out or bounced + // or timed out. + + $r = q("select channel_id from channel where channel_removed = 1 and + channel_deleted > %s - INTERVAL %s and channel_deleted < %s - INTERVAL %s", + db_utcnow(), db_quoteinterval('21 DAY'), + db_utcnow(), db_quoteinterval('10 DAY') + ); + if($r) { + foreach($r as $rv) { + channel_remove_final($rv['channel_id']); + } + } // get rid of really old poco records |