From a51b45df903df3f9c31ed9cbef1ae3fec3a8924b Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Thu, 19 May 2022 10:35:08 +0300 Subject: [PATCH] move config params --- .../Espo/Resources/defaults/config.php | 51 ++++++++++++++++++- .../Espo/Resources/defaults/systemConfig.php | 22 -------- 2 files changed, 49 insertions(+), 24 deletions(-) diff --git a/application/Espo/Resources/defaults/config.php b/application/Espo/Resources/defaults/config.php index 5b6d2d8285..7921ec6abe 100644 --- a/application/Espo/Resources/defaults/config.php +++ b/application/Espo/Resources/defaults/config.php @@ -38,6 +38,26 @@ return [ 'password' => '', ], 'useCache' => true, + /** Max number of jobs per one execution. */ + 'jobMaxPortion' => 15, + /** Max execution time (in seconds) allocated for a single job. If exceeded then set to Failed.*/ + 'jobPeriod' => 7800, + /** Max execution time (in seconds) allocated for a single job with active process. + * If exceeded then set to Failed. */ + 'jobPeriodForActiveProcess' => 36000, + /** Number of attempts to re-run failed jobs. */ + 'jobRerunAttemptNumber' => 1, + /** Jobs will be executed in parallel processes. */ + 'jobRunInParallel' => false, + /** Max number of processes run simultaneously. */ + 'jobPoolConcurrencyNumber' => 8, + /** Min interval (in seconds) between two CRON runs. */ + 'cronMinInterval' => 2, + /** Max number of CRON processes run simultaneously. */ + 'daemonMaxProcessNumber' => 5, + /** Interval between process runs in seconds. */ + 'daemonInterval' => 10, + 'daemonProcessTimeout' => 36000, 'recordsPerPage' => 20, 'recordsPerPageSmall' => 5, 'recordsPerPageSelect' => 10, @@ -78,8 +98,35 @@ return [ 'Lead', 'Opportunity', ], - 'tabList' => ["Account", "Contact", "Lead", "Opportunity", "Case", "Email", "Calendar", "Meeting", "Call", "Task", "_delimiter_", "Document", "Campaign", "KnowledgeBaseArticle", "Stream", "User"], - 'quickCreateList' => ["Account", "Contact", "Lead", "Opportunity", "Meeting", "Call", "Task", "Case", "Email"], + 'tabList' => [ + "Account", + "Contact", + "Lead", + "Opportunity", + "Case", + "Email", + "Calendar", + "Meeting", + "Call", + "Task", + "_delimiter_", + "Document", + "Campaign", + "KnowledgeBaseArticle", + "Stream", + "User" + ], + 'quickCreateList' => [ + "Account", + "Contact", + "Lead", + "Opportunity", + "Meeting", + "Call", + "Task", + "Case", + "Email" + ], 'exportDisabled' => false, 'adminNotifications' => true, 'adminNotificationsNewVersion' => true, diff --git a/application/Espo/Resources/defaults/systemConfig.php b/application/Espo/Resources/defaults/systemConfig.php index b353bb5abb..bf1f471958 100644 --- a/application/Espo/Resources/defaults/systemConfig.php +++ b/application/Espo/Resources/defaults/systemConfig.php @@ -34,28 +34,6 @@ return [ 'user' => '', 'group' => '', ], - /** Max number of jobs per one execution. */ - 'jobMaxPortion' => 15, - /** Max execution time (in seconds) allocated for a single job. If exceeded then set to Failed.*/ - 'jobPeriod' => 7800, - /** - * Max execution time (in seconds) allocated for a single job with active process. - * If exceeded then set to Failed. - */ - 'jobPeriodForActiveProcess' => 36000, - /** Number of attempts to re-run failed jobs. */ - 'jobRerunAttemptNumber' => 1, - /** Jobs will be executed in parallel processes. */ - 'jobRunInParallel' => false, - /** Max number of processes run simultaneously. */ - 'jobPoolConcurrencyNumber' => 8, - /** Min interval (in seconds) between two CRON runs. */ - 'cronMinInterval' => 2, - /** Max number of CRON processes run simultaneously. */ - 'daemonMaxProcessNumber' => 5, - /** Interval between process runs in seconds. */ - 'daemonInterval' => 10, - 'daemonProcessTimeout' => 36000, 'crud' => [ 'get' => 'read', 'post' => 'create',