Merge pull request #9 from ildelux/master

Prevent timeout in controller
contactlab · Dec 4, 2018 · 9f8c949 · 9f8c949
2 parents 364c567 + 51ab0c6
commit 9f8c949
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/app/code/community/Contactlab/Hub/controllers/Adminhtml/Contactlab/Hub/ExportController.php b/app/code/community/Contactlab/Hub/controllers/Adminhtml/Contactlab/Hub/ExportController.php
@@ -16,7 +16,11 @@ public function queueAction()
     public function resetAction()
     {    	
     	Mage::getModel("contactlab_hub/exporter_PreviousCustomers")->resetExport();
-    	Mage::getModel("contactlab_hub/cron")->exportPreviousCustomers();
+        $this->_getSession()->addSuccess(
+            Mage::helper('contactlab_hub')->__('The queue of all previous customers has been correctly reset.')
+        );
+    	// prevent timeout in controller
+        // Mage::getModel("contactlab_hub/cron")->exportPreviousCustomers();
     	return $this->_redirect('adminhtml/contactlab_hub_logs');
     }
 

diff --git a/app/code/community/Contactlab/Hub/etc/config.xml b/app/code/community/Contactlab/Hub/etc/config.xml
@@ -2,7 +2,7 @@
 <config>
     <modules>
         <Contactlab_Hub>
-            <version>2.0.1</version>
+            <version>2.1.0</version>
         </Contactlab_Hub>
     </modules>
     <global>

diff --git a/composer.json b/composer.json
@@ -8,7 +8,7 @@
         "magento-hackathon/magento-composer-installer": "*"
     },
     "type": "magento-module",
-    "version": "2.0.1",
+    "version": "2.1.0",
     "license": [
         "OSL-3.0",
         "AFL-3.0"