From 8b3db1027d89bf39d9362cdb0474f884fe02c593 Mon Sep 17 00:00:00 2001 From: Anton Evers Date: Fri, 10 Jul 2015 10:06:31 +0200 Subject: [PATCH 1/3] Add groups and jobs to the observer event that are expected in \Aoe_Scheduler_Model_Observer::dispatch This fixes groups/job functionality in the default cron group --- shell/scheduler.php | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/shell/scheduler.php b/shell/scheduler.php index 2a3920b..6356213 100644 --- a/shell/scheduler.php +++ b/shell/scheduler.php @@ -349,12 +349,19 @@ public function cronAction() switch ($mode) { case 'always': case 'default': - $includeGroups = array_filter(array_map('trim', explode(',', $this->getArg('include')))); - $excludeGroups = array_filter(array_map('trim', explode(',', $this->getArg('exclude')))); - Mage::getConfig()->init()->loadEventObservers('crontab'); - Mage::app()->addEventArea('crontab'); - Mage::dispatchEvent($mode, array('include' => $includeGroups, 'exclude' => $excludeGroups)); - break; + $includeGroups = array_filter(array_map('trim', explode(',', $this->getArg('includeGroups')))); + $excludeGroups = array_filter(array_map('trim', explode(',', $this->getArg('excludeGroups')))); + $includeJobs = array_filter(array_map('trim', explode(',', $this->getArg('includeJobs')))); + $excludeJobs = array_filter(array_map('trim', explode(',', $this->getArg('excludeJobs')))); + Mage::getConfig()->init()->loadEventObservers('crontab'); + Mage::app()->addEventArea('crontab'); + Mage::dispatchEvent($mode, array( + 'include_groups' => $includeGroups, + 'exclude_groups' => $excludeGroups, + 'include_jobs' => $includeJobs, + 'exclude_jobs' => $excludeJobs, + )); + break; default: echo "\nInvalid mode!\n\n"; echo $this->usageHelp(); From 30d9944e90744f098de8bcf4f781f4cef83bc556 Mon Sep 17 00:00:00 2001 From: Anton Evers Date: Fri, 10 Jul 2015 11:16:47 +0200 Subject: [PATCH 2/3] line indenting fix --- shell/scheduler.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/shell/scheduler.php b/shell/scheduler.php index 6356213..929d06d 100644 --- a/shell/scheduler.php +++ b/shell/scheduler.php @@ -349,18 +349,18 @@ public function cronAction() switch ($mode) { case 'always': case 'default': - $includeGroups = array_filter(array_map('trim', explode(',', $this->getArg('includeGroups')))); - $excludeGroups = array_filter(array_map('trim', explode(',', $this->getArg('excludeGroups')))); - $includeJobs = array_filter(array_map('trim', explode(',', $this->getArg('includeJobs')))); - $excludeJobs = array_filter(array_map('trim', explode(',', $this->getArg('excludeJobs')))); - Mage::getConfig()->init()->loadEventObservers('crontab'); - Mage::app()->addEventArea('crontab'); - Mage::dispatchEvent($mode, array( - 'include_groups' => $includeGroups, - 'exclude_groups' => $excludeGroups, - 'include_jobs' => $includeJobs, - 'exclude_jobs' => $excludeJobs, - )); + $includeGroups = array_filter(array_map('trim', explode(',', $this->getArg('includeGroups')))); + $excludeGroups = array_filter(array_map('trim', explode(',', $this->getArg('excludeGroups')))); + $includeJobs = array_filter(array_map('trim', explode(',', $this->getArg('includeJobs')))); + $excludeJobs = array_filter(array_map('trim', explode(',', $this->getArg('excludeJobs')))); + Mage::getConfig()->init()->loadEventObservers('crontab'); + Mage::app()->addEventArea('crontab'); + Mage::dispatchEvent($mode, array( + 'include_groups' => $includeGroups, + 'exclude_groups' => $excludeGroups, + 'include_jobs' => $includeJobs, + 'exclude_jobs' => $excludeJobs, + )); break; default: echo "\nInvalid mode!\n\n"; From fb2ddf8a5dc4742aec05f7de10c4a96242a05776 Mon Sep 17 00:00:00 2001 From: Anton Evers Date: Fri, 10 Jul 2015 11:17:45 +0200 Subject: [PATCH 3/3] line indenting fix --- shell/scheduler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell/scheduler.php b/shell/scheduler.php index 929d06d..b396161 100644 --- a/shell/scheduler.php +++ b/shell/scheduler.php @@ -361,7 +361,7 @@ public function cronAction() 'include_jobs' => $includeJobs, 'exclude_jobs' => $excludeJobs, )); - break; + break; default: echo "\nInvalid mode!\n\n"; echo $this->usageHelp();