From 5e99888b0825280ace90d7763455e6408d1f1dd0 Mon Sep 17 00:00:00 2001 From: "Donald A. Lobo" Date: Fri, 22 Nov 2013 06:38:35 -0800 Subject: [PATCH] CRM-13815 - Restrict the number of scheduled jobs log entries shown http://issues.civicrm.org/jira/browse/CRM-13815 --- CRM/Admin/Page/JobLog.php | 15 ++++++++++----- templates/CRM/Admin/Page/JobLog.tpl | 2 +- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/CRM/Admin/Page/JobLog.php b/CRM/Admin/Page/JobLog.php index f376b7a90d..80df716d30 100644 --- a/CRM/Admin/Page/JobLog.php +++ b/CRM/Admin/Page/JobLog.php @@ -101,20 +101,25 @@ class CRM_Admin_Page_JobLog extends CRM_Core_Page_Basic { $sj = new CRM_Core_JobManager(); $jobName = NULL; - foreach ($sj->jobs as $i => $job) { - if ($job->id == $jid) { - $jobName = $job->name; - } + if ($jid) { + $jobName = + CRM_Core_DAO::getFieldValue('CRM_Core_DAO_Job', $jid); } $this->assign('jobName', $jobName); $dao = new CRM_Core_DAO_JobLog(); $dao->orderBy('id desc'); - if ($jobName) { + + // limit to last 1000 records + $dao->limit(1000); + + if ($jid) { $dao->job_id = $jid; } $dao->find(); + + $rows = array(); while ($dao->fetch()) { unset($row); diff --git a/templates/CRM/Admin/Page/JobLog.tpl b/templates/CRM/Admin/Page/JobLog.tpl index c72820d593..a17114c98a 100644 --- a/templates/CRM/Admin/Page/JobLog.tpl +++ b/templates/CRM/Admin/Page/JobLog.tpl @@ -24,7 +24,7 @@ +--------------------------------------------------------------------+ *}
- {ts}This screen presents the list of scheduled jobs (cron tasks) log entries.{/ts} {$docLink} + {ts}This screen presents the list of most recent 1,000 scheduled jobs log entries.{/ts} {$docLink}
{if $jobId} -- 2.25.1