From b25684a5a677df493f7c8b72f1bb8ac27fdb8bf0 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Thu, 22 May 2025 19:57:35 +0300
Subject: make default task schedules configurable

---
 classes/RSSUtils.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'classes/RSSUtils.php')

diff --git a/classes/RSSUtils.php b/classes/RSSUtils.php
index 376996a95..5fc8ddcef 100644
--- a/classes/RSSUtils.php
+++ b/classes/RSSUtils.php
@@ -1689,7 +1689,7 @@ class RSSUtils {
 
 		$scheduler = Scheduler::getInstance();
 
-		$scheduler->add_scheduled_task('purge_orphans', '@daily',
+		$scheduler->add_scheduled_task('purge_orphans', Config::get(Config::SCHEDULE_PURGE_ORPHANS),
 			function() {
 				Article::_purge_orphans();
 
@@ -1697,7 +1697,7 @@ class RSSUtils {
 			}
 		);
 
-		$scheduler->add_scheduled_task('disk_cache_expire_all', '@daily',
+		$scheduler->add_scheduled_task('disk_cache_expire_all', Config::get(Config::SCHEDULE_PURGE_ORPHANS),
 			function() {
 				$cache = DiskCache::instance("");
 				$cache->expire_all();
@@ -1706,7 +1706,7 @@ class RSSUtils {
 			}
 		);
 
-		$scheduler->add_scheduled_task('disable_failed_feeds', '@daily',
+		$scheduler->add_scheduled_task('disable_failed_feeds', Config::get(Config::SCHEDULE_DISABLE_FAILED_FEEDS),
 			function() {
 				self::disable_failed_feeds();
 
@@ -1714,7 +1714,7 @@ class RSSUtils {
 			}
 		);
 
-		$scheduler->add_scheduled_task('migrate_feed_icons', '@daily',
+		$scheduler->add_scheduled_task('migrate_feed_icons', Config::get(Config::SCHEDULE_MIGRATE_FEED_ICONS),
 			function() {
 				self::migrate_feed_icons();
 
@@ -1722,7 +1722,7 @@ class RSSUtils {
 			}
 		);
 
-		$scheduler->add_scheduled_task('cleanup_feed_icons', '@daily',
+		$scheduler->add_scheduled_task('cleanup_feed_icons', Config::get(Config::SCHEDULE_CLEANUP_FEED_ICONS),
 			function() {
 				self::cleanup_feed_icons();
 
@@ -1730,7 +1730,7 @@ class RSSUtils {
 			}
 		);
 
-		$scheduler->add_scheduled_task('log_daemon_update_login_limit_users', '@daily',
+		$scheduler->add_scheduled_task('log_daemon_update_login_limit_users', Config::get(Config::SCHEDULE_LOG_DAEMON_UPDATE_LOGIN_LIMIT_USERS),
 			function() {
 				$login_limit = Config::get(Config::DAEMON_UPDATE_LOGIN_LIMIT);
 
@@ -1753,7 +1753,7 @@ class RSSUtils {
 			}
 		);
 
-		$scheduler->add_scheduled_task('expire_error_log', '@hourly',
+		$scheduler->add_scheduled_task('expire_error_log', Config::get(Config::SCHEDULE_EXPIRE_ERROR_LOG),
 			function() {
 				self::expire_error_log();
 
@@ -1761,7 +1761,7 @@ class RSSUtils {
 			}
 		);
 
-		$scheduler->add_scheduled_task('expire_lock_files', '@hourly',
+		$scheduler->add_scheduled_task('expire_lock_files', Config::get(Config::SCHEDULE_EXPIRE_LOCK_FILES),
 			function() {
 				self::expire_lock_files();
 
@@ -1769,7 +1769,7 @@ class RSSUtils {
 			}
 		);
 
-		$scheduler->add_scheduled_task('send_headlines_digests', '@hourly',
+		$scheduler->add_scheduled_task('send_headlines_digests', Config::get(Config::SCHEDULE_SEND_HEADLINES_DIGESTS),
 			function() {
 				Digest::send_headlines_digests();
 
-- 
cgit v1.2.3-54-g00ecf


From dba83a639c2cd6110da47a64362f6a5f21acfd7b Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Thu, 22 May 2025 20:36:09 +0300
Subject: fix wrong config param being used & add a link to cron syntax we
 support

---
 classes/Config.php   | 4 +++-
 classes/RSSUtils.php | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'classes/RSSUtils.php')

diff --git a/classes/Config.php b/classes/Config.php
index 57878fb42..23aaecf6b 100644
--- a/classes/Config.php
+++ b/classes/Config.php
@@ -188,7 +188,9 @@ class Config {
 	 * key is a 32 byte hex string which may be generated using `update.php --gen-encryption-key` */
 	const ENCRYPTION_KEY = "ENCRYPTION_KEY";
 
-	/** scheduled task to purge orphaned articles, value should be valid cron expression */
+	/** scheduled task to purge orphaned articles, value should be valid cron expression
+	 * @see https://github.com/dragonmantank/cron-expression/blob/master/README.md#cron-expressions
+	*/
 	const SCHEDULE_PURGE_ORPHANS = "SCHEDULE_PURGE_ORPHANS";
 
 	/** scheduled task to expire disk cache, value should be valid cron expression */
diff --git a/classes/RSSUtils.php b/classes/RSSUtils.php
index 5fc8ddcef..c0012afcb 100644
--- a/classes/RSSUtils.php
+++ b/classes/RSSUtils.php
@@ -1697,7 +1697,7 @@ class RSSUtils {
 			}
 		);
 
-		$scheduler->add_scheduled_task('disk_cache_expire_all', Config::get(Config::SCHEDULE_PURGE_ORPHANS),
+		$scheduler->add_scheduled_task('disk_cache_expire_all', Config::get(Config::SCHEDULE_DISK_CACHE_EXPIRE_ALL),
 			function() {
 				$cache = DiskCache::instance("");
 				$cache->expire_all();
-- 
cgit v1.2.3-54-g00ecf