mirror of
https://github.com/SuiteCRM/SuiteCRM-Core.git
synced 2025-08-29 17:46:02 +08:00
Squashed 'public/legacy/' changes from 4f401678fd..5a66316965
5a66316965 SuiteCRM 7.12.3 Release 1cfaf51831 Fix #9454 - Avoid duplicate results in basic search 7eb52791f1 Fix #9455 - Popup metadata override removed when filtered a21463bee1 Fix #8155 - Removed Unused PDF Settings 7f3c59f382 Fix #8948 - Make Project Tasks Importable ac4a1e79a7 Fix #9191 - Add utf normalization repair command bcb784eef7 Fix #9434 - Cron notion unit test fails 2e4aa8f594 Fix #8309 - Delete button showing for users with no delete access bf5fe39148 Fix #8525 - Bulk Action label not showing for users without delete access 1a45a93b5c Fix #9398 - Consistently store dropdowns in $app_list_strings rather than $GLOBALS 664b2d5c74 Fix #9406 - Validation displayed static message isn't correct de192fa845 Fix #9271 - Primary Email property is kept after ading an extra Email address 206db24eaa Fix #9378 - Filter by Email1 Field Through the API 6c39d73580 Fix #9312 - Declaring object within StudioClass to remove Strict Warnings be2044b341 Fix #9387 - Correct Variable Names 7e3c96d5b4 Fix #9387 - Clean Cron Historic and Failed Jobs b3e0556482 Fix #9387 - Display Actual Job Result in Subpanel 90b4e0423a Fix issue #9380 where date action in workflow fails to save Add check on if value is array, if is array don't attempt date formatting 864d614945 Fix #9408 - adding fix for deleting emails 7b442f10ca Merge next into suite 8 b522a5acf3 [Legacy] Meeting Module Styling Fixes 4e4d4e7d86 [Legacy] Admin Import Styling Fixes e320acd63c [Legacy] Popup Selector Styling Fixes 60acfc36f5 [Legacy] Backup Modules Styling Fixes 73cc52ce14 [Legacy] Jotpad Dashlet Styling Fixes 0128df2e63 [Legacy] User Name Longtext styling fixes f12c72e8f6 [Legacy] Diagnostic Tool Whitespace Styling Fixes 841b16e033 [Legacy] Dashboard Dashlet Styling Fixes e274de5a58 [Legacy] Scheduler Styling Fixes 0c330bc280 [Legacy] Reports Subpanels Styling Fixes 0730d433b2 [Legacy] Meeting Popup Selector Styling Fixes a22626df09 [Legacy] Bump version to 8.0.0 ebde6fb8cc [Legacy] Apply set-timezone styling ot the the users set-timezone page 55f1e360df [Legacy] Add name mapping for SetTimezone action 44fa660c65 [Legacy] Define summary templates for contacts, leads, prospects f363b741f9 [Legacy] Change Contacts detailviewdefs to use full name 8afde55218 [Legacy] Fix .htaccess build to take the full CRM url into account 8373995c26 [Legacy] Admin diagnostic tool styling fixes 03593b259c [Legacy] Disable upgrade wizard in admin 66c9fe4d8f [Legacy] Remove lucene and AOD_index 21f9844286 [Legacy] Fix event invite mod_strings handling 04bdfd8975 [Legacy] Forgot Password Page Styling Fixes ba459af407 [Legacy] fix redirect from projects subpanel 0f19a141d1 [Legacy] Add Default Link Item Mapper - add relate module injection on backend bean field_defs efc2083eaf [Legacy] Email Body Styling Fixes 648a1d9350 Merge next into suite 8 a0cfd72ab3 [Legacy] Remove deprecated spots module 103fd1076f [Legacy] Fix capitalized url on user profile calendar options 97fca254bd [Legacy] Re-add user module reset password modal 864c35c4ad [Legacy] Remove echo on user save 169a15a6c9 [Legacy] Close user action dropdown on password reset e8c400ab24 [Legacy] Fix user triggered password reset e38f48c6d4 [Legacy] Fix password recovery templates setup on install 927969c9a3 [Legacy] Bump version to 8.0.0-rc.2 b27584577d [Legacy] UserProfile Settings Modal Styling Fixes 2aba88dfe8 [Legacy] Meetings Styling Fixes 13d743e598 [Legacy] Password & System Settings Action Button Fixes cfb0bcc86d [Legacy] User Setup Modal Styling Fixes d05f3aa4f5 [Legacy] Fix legacy widget acl definitions e469e337f8 [Legacy] Suite 8 extensions to legacy plugins 41e84b1d17 [Legacy] Override server variables when doing kernel bypass 7f5d03f280 Merge commit '75ea167930' into suite7merge c5f43d6c88 [Legacy] Popup Selector Styling Fixes 0445c1c0ab [Legacy] update install language label eb3fe0472b [Legacy] Dashlet Settings Modal Styling Fixes 6f0918b73d [Legacy] User Profile Mobile Styling Fixes 5af790f7fa [Legacy] Add acls calculation on legacy list data calls 096a59a7cf [Legacy] Get list of visible modules from module name mapper c2d618e631 Fix valid module check aa79de3a31 [Legacy] add widget acl metadata - update acl config for top widget 315b554b7e [Legacy] Subpanels Action Button Styling Fixes c87e66a262 remove photo widgets for contacts and leads 433940a72f [Legacy] Admin Release Styling Fixes c0a1378873 Suite8 ChangeLog ModalPopup Styling Fixes aa484f3f9e [Legacy] Add close menu label 8f81b47c65 [Legacy] Add not module selected label 36a0b05eb2 [Legacy] Add parent type ApiBeanMapper 7e02d1d23c [Legacy] Fix username display for unauthorized users 2ea8f210a1 [Legacy] DetailView Header Title Overlaps fixes 2a25edd6c4 [Legacy] Fix htaccess generation 34500ba791 Fix Date Filed for Targets 211ce6bfbb [Legacy] Remove Button Hover Fixes 223adf26bc [Legacy] Reports footer button removed fixes c567777afe [Legacy] Reports Styling Fixes 6f71ed31c2 [Legacy] Maps Button Position Fixes c5d5936c22 [Legacy] Add Tab Dashlet Sapcing Fixes 018c11c562 [Legacy] Dashlet Setting Modal Label Fix & Button Fixes 9645c68ca6 [Legacy] Activity Stream Post Button Hover color fixes 445ab52dae [Legacy] Bump version to 8.0.0-rc e10b872b21 [Legacy] Remove license from install app strings e5c21ca68c Merge commit 'dd455a1c2d' into legacy_update_2 3886e3cfa6 Fix ignore system checks valitation 415cdd57b0 [Legacy] Add install labels 70ae186de5 [Legacy] add new install labels 7e05e69580 [Legacy] add install validator class 4c4ed83f3d [Legacy] Add Label for Subpanel Edit Line Action 17d8f4e7e9 [Legacy] Dashboard Mobile Styling Fixes abd914702a [Legacy] History Subpanel Button Styling Fixes 34a0dac449 [Legacy] Workflow Stying Fixes 32c4827895 [Legacy] Convert Lead Styling Fixes f1ca14c009 [Legacy] Roles Styling Fixes 3dbdce8055 [Legacy] Admin Modules label font fixes 36a38a1c44 [Legacy] HomePage Mobile Fixes a5b451ab12 update legacy handlers to apply new logic considering - base actions - action resolvers - fix url navigation issue in classic view 87e6e239ce [Legacy] Module framework - move suite 8 module config to legacy ee973e74f6 [Legacy] Add support for more metadata on listviewdefs ad312c45fd [Legacy] Add Support for all modules with parent css classes a409d81e2b [Legacy] Security Group Styling Fixes 5171ae319f [Legacy] Password Management Mobile Fixes d0eca8193d [Leagcy] Email Settings Fixes 766af5f4e6 [Legacy] Products Modules Buttons fixes 99ec9e30f9 [Legacy] OAUTH2 Clients and tokens fixes 54c962a532 [Legacy] adapt legacy install scripts to work with Suite8 install d6f20e38e6 [Legacy] add labels for S8 Installer 83b00b6a94 [Legacy] Add widget not found label 3ac807db61 Merge commit '114b895b6d' into merge_develop 1feeb409f8 [Legacy] Email Action DropDown Styling Fixes git-subtree-dir: public/legacy git-subtree-split: 5a663169652b57bb561de74a7e3a8051c9330a83
This commit is contained in:
Clemente Raposo
parent
41c2374a54
commit
588534d022
160 changed files with 2854 additions and 6446 deletions
|
|
@ -211,10 +211,12 @@ class SugarCronJobs
|
|||
$GLOBALS['log']->fatal("Job runs too frequently, throttled to protect the system.");
|
||||
return;
|
||||
}
|
||||
// clean old stale jobs
|
||||
// clean stale jobs
|
||||
if (!$this->queue->cleanup()) {
|
||||
$this->jobFailed();
|
||||
}
|
||||
// delete expired jobs
|
||||
$this->queue->clearHistoricJobs();
|
||||
// run schedulers
|
||||
if (!$this->disable_schedulers) {
|
||||
$this->queue->runSchedulers();
|
||||
|
|
|
|||
|
|
@ -55,6 +55,7 @@ class SugarJobQueue
|
|||
* @var int
|
||||
*/
|
||||
public $jobTries = 5;
|
||||
|
||||
/**
|
||||
* Job running timeout - longer than that, job is failed by force
|
||||
* @var int
|
||||
|
|
@ -67,6 +68,20 @@ class SugarJobQueue
|
|||
*/
|
||||
protected $job_queue_table;
|
||||
|
||||
/**
|
||||
* Success History Lifetime
|
||||
* Defines the time in days for successful cron jobs to remain before deletion
|
||||
* @var int
|
||||
*/
|
||||
|
||||
public $success_lifetime = 30; // 30 days
|
||||
/**
|
||||
* Failure History Lifetime
|
||||
* Defines the time in days for failed cron jobs to remain before deletion
|
||||
* @var int
|
||||
*/
|
||||
public $failure_lifetime = 180; // 180 days
|
||||
|
||||
/**
|
||||
* DB connection
|
||||
* @var DBManager
|
||||
|
|
@ -84,6 +99,12 @@ class SugarJobQueue
|
|||
if (!empty($GLOBALS['sugar_config']['jobs']['timeout'])) {
|
||||
$this->timeout = $GLOBALS['sugar_config']['jobs']['timeout'];
|
||||
}
|
||||
if (!empty($GLOBALS['sugar_config']['jobs']['failure_lifetime'])) {
|
||||
$this->failure_lifetime = $GLOBALS['sugar_config']['jobs']['failure_lifetime'];
|
||||
}
|
||||
if (!empty($GLOBALS['sugar_config']['jobs']['success_lifetime'])) {
|
||||
$this->success_lifetime = $GLOBALS['sugar_config']['jobs']['success_lifetime'];
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -167,24 +188,46 @@ class SugarJobQueue
|
|||
}
|
||||
|
||||
/**
|
||||
* Remove old jobs that still are marked as running
|
||||
* Cleanup old, failed or long running jobs
|
||||
* Forcefully remove jobs that are marked as running when they exceed the timeout value
|
||||
* @return bool true if no failed job discovered, false if some job were failed
|
||||
*/
|
||||
public function cleanup()
|
||||
{
|
||||
// fail jobs that are too old
|
||||
$ret = true;
|
||||
// bsitnikovski@sugarcrm.com bugfix #56144: Scheduler Bug
|
||||
$date = $this->db->convert($this->db->quoted($GLOBALS['timedate']->getNow()->modify("-{$this->timeout} seconds")->asDb()), 'datetime');
|
||||
$res = $this->db->query("SELECT id FROM {$this->job_queue_table} WHERE status='".SchedulersJob::JOB_STATUS_RUNNING."' AND date_modified <= $date");
|
||||
$date = $this->db->convert($GLOBALS['timedate']->getNow()->modify("-{$this->timeout} seconds")->asDb(), 'datetime');
|
||||
$sql = "SELECT id FROM {$this->job_queue_table} WHERE status='".SchedulersJob::JOB_STATUS_RUNNING."' AND date_modified <= '{$date}'";
|
||||
$res = $this->db->query($sql);
|
||||
while ($row = $this->db->fetchByAssoc($res)) {
|
||||
$this->resolveJob($row["id"], SchedulersJob::JOB_FAILURE, translate('ERR_TIMEOUT', 'SchedulersJobs'));
|
||||
$ret = false;
|
||||
}
|
||||
// TODO: soft-delete old done jobs?
|
||||
return $ret;
|
||||
}
|
||||
|
||||
/**
|
||||
* Marks jobs for deletion that have exceeded their history lifetime
|
||||
* Uses different values for successful and failed jobs
|
||||
*/
|
||||
public function clearHistoricJobs()
|
||||
{
|
||||
// Process successful jobs
|
||||
$date = $this->db->convert($GLOBALS['timedate']->getNow()->modify("-{$this->success_lifetime} days")->asDb(), 'datetime');
|
||||
$sql = "SELECT id FROM {$this->job_queue_table} WHERE status='".SchedulersJob::JOB_STATUS_DONE."' AND resolution='".SchedulersJob::JOB_SUCCESS."' AND date_modified <= '{$date}'";
|
||||
$res = $this->db->query($sql);
|
||||
while ($row = $this->db->fetchByAssoc($res)) {
|
||||
$this->deleteJob($row["id"]);
|
||||
}
|
||||
|
||||
// Process failed jobs
|
||||
$date = $this->db->convert($GLOBALS['timedate']->getNow()->modify("-{$this->failure_lifetime} days")->asDb(), 'datetime');
|
||||
$sql = "SELECT id FROM {$this->job_queue_table} WHERE status='".SchedulersJob::JOB_STATUS_DONE."' AND resolution!='".SchedulersJob::JOB_SUCCESS."' AND date_modified <= '{$date}'";
|
||||
$res = $this->db->query($sql);
|
||||
while ($row = $this->db->fetchByAssoc($res)) {
|
||||
$this->deleteJob($row["id"]);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Nuke all jobs from the queue
|
||||
*/
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue
