Merge pull request #43 from Ethan3600/1.x-develop

Upgrade to v1.3.4
Ethan3600 · Apr 19, 2018 · 4b7f115 · 4b7f115
2 parents eb17e67 + 58447fa
commit 4b7f115
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/Controller/Adminhtml/Manage/Job/Create.php b/Controller/Adminhtml/Manage/Job/Create.php
@@ -50,7 +50,7 @@ public function execute()
         $scheduledAt = $this->getRequest()->getParam('scheduled_at');
         try {
             $this->cronJobManager->createCronJob($jobCode, $scheduledAt);
-        } catch (\Magento\Framework\Exception\CronException $e) {
+        } catch (\Exception $e) {
             $this->getMessageManager()->addErrorMessage($e->getMessage());
             $this->_redirect('*/manage/create/');
             return;

diff --git a/Controller/Adminhtml/Manage/Job/Dispatch.php b/Controller/Adminhtml/Manage/Job/Dispatch.php
@@ -50,7 +50,7 @@ public function execute()
         $jobCode = $this->getRequest()->getParam('job_code');
         try {
             $this->cronJobManager->dispatchCron($jobId, $jobCode);
-        } catch (\Magento\Framework\Exception\CronException $e) {
+        } catch (\Exception $e) {
             $this->getMessageManager()->addErrorMessage($e->getMessage());
             $this->_redirect('*/manage/index/');
             return;

diff --git a/Controller/Adminhtml/Manage/Job/Flush.php b/Controller/Adminhtml/Manage/Job/Flush.php
@@ -48,7 +48,7 @@ public function execute()
     {
         try {
             $this->cronJobManager->flushCrons();
-        } catch (\Magento\Framework\Exception\CronException $e) {
+        } catch (\Exception $e) {
             $this->getMessageManager()->addErrorMessage($e->getMessage());
             $this->_redirect('*/manage/index/');
             return;

diff --git a/Helper/Processor.php b/Helper/Processor.php
@@ -94,9 +94,10 @@ public function runJob($scheduledTime, $currentTime, $jobConfig, $schedule, $gro
         $callback = [$model, $jobConfig['method']];
         if (!is_callable($callback)) {
             $schedule->setStatus(Schedule::STATUS_ERROR);
-            throw new \Exception(
-                sprintf('Invalid callback: %s::%s can\'t be called', $jobConfig['instance'], $jobConfig['method'])
-            );
+            throw new \Exception(sprintf('Invalid callback: %s::%s can\'t be called', 
+                $jobConfig['instance'],
+                $jobConfig['method']
+            ));
         }
         $schedule->setExecutedAt(strftime('%Y-%m-%d %H:%M:%S', $this->dateTime->gmtTimestamp()))->save();
 
@@ -106,7 +107,7 @@ public function runJob($scheduledTime, $currentTime, $jobConfig, $schedule, $gro
         } catch (\Throwable $e) {
             $schedule->setStatus(Schedule::STATUS_ERROR);
             $this->logger->error(sprintf(
-                'Cron Job %s has an error: %s. Statistics: %s',
+                'Cron Job %s has an error: %s.',
                 $jobCode,
                 $e->getMessage()
             ));
@@ -234,4 +235,4 @@ private function getCronGroupConfigurationValue($groupId, $path)
                 ScopeInterface::SCOPE_STORE
             );
     }
-}
+}
diff --git a/etc/module.xml b/etc/module.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="EthanYehuda_CronjobManager" setup_version="1.3.3" >
+    <module name="EthanYehuda_CronjobManager" setup_version="1.3.4" >
     	<sequence>
             <module name="Magento_Cron"/>
         </sequence>