record last cron expression (and stub owner_uid) used by scheduled task

3 files changed, 6 insertions, 1 deletions

diff --git a/classes/Config.php b/classes/Config.php
index c413317be..a4d2eb6b3 100644
--- a/classes/Config.php
+++ b/classes/Config.php
@@ -6,7 +6,7 @@ class Config {
 	const T_STRING = 2;
 	const T_INT = 3;
 
-	const SCHEMA_VERSION = 150;
+	const SCHEMA_VERSION = 151;
 
 	/** override default values, defined below in _DEFAULTS[], prefixing with _ENVVAR_PREFIX:
 	 *
diff --git a/classes/Pref_System.php b/classes/Pref_System.php
index c5d7ab606..7946dc293 100644
--- a/classes/Pref_System.php
+++ b/classes/Pref_System.php
@@ -33,6 +33,7 @@ class Pref_System extends Handler_Administrative {
 		<table width='100%' class='event-log'>
 		<tr>
 			<th><?= __("Task name") ?></th>
+			<th><?= __("Schedule") ?></th>
 			<th><?= __("Last executed") ?></th>
 			<th><?= __("Duration (seconds)") ?></th>
 			<th><?= __("Return code") ?></th>
@@ -40,6 +41,7 @@ class Pref_System extends Handler_Administrative {
 		<?php
 
 		$task_records = ORM::for_table('ttrss_scheduled_tasks')
+			->order_by_asc(['last_cron_expression', 'task_name'])
 			->find_many();
 
 		foreach ($task_records as $task) {
@@ -48,6 +50,7 @@ class Pref_System extends Handler_Administrative {
 			?>
 			<tr>
 				<td class="<?= $row_style ?>"><?= $task->task_name ?></td>
+				<td><?= $task->last_cron_expression ?></td>
 				<td><?= TimeHelper::make_local_datetime($task->last_run) ?></td>
 				<td><?= $task->last_duration ?></td>
 				<td><?= $task->last_rc ?></td>
diff --git a/classes/Scheduler.php b/classes/Scheduler.php
index ce6a2f67d..77e858b56 100644
--- a/classes/Scheduler.php
+++ b/classes/Scheduler.php
@@ -117,6 +117,7 @@ class Scheduler {
 					$task_record->last_run = Db::NOW();
 					$task_record->last_duration = $task_duration;
 					$task_record->last_rc = $rc;
+					$task_record->last_cron_expression = $task['cron']->getExpression();
 
 					$task_record->save();
 				} else {
@@ -127,6 +128,7 @@ class Scheduler {
 						'last_duration' => $task_duration,
 						'last_rc' => $rc,
 						'last_run' => Db::NOW(),
+						'last_cron_expression' => $task['cron']->getExpression()
 					]);
 
 					$task_record->save();