feat(Cron): Add magento tables/directories to cron job;

dhyegocalota · dhyegocalota · commit 379545ceee2c · 2015-12-11T10:01:55.000-03:00
refactor(Redis, Memcached): Redirect error output to normal output
refactor(Cache): Change routers typo
diff --git a/Kasterweb_Cleaner-1.0.2.tgz b/Kasterweb_Cleaner-1.0.2.tgz
diff --git a/Kasterweb_Cleaner-1.1.0.tgz b/Kasterweb_Cleaner-1.1.0.tgz
diff --git a/app/code/community/Kasterweb/Cleaner/Block/Adminhtml/Cache.php b/app/code/community/Kasterweb/Cleaner/Block/Adminhtml/Cache.php
@@ -2,14 +2,14 @@
 
 class Kasterweb_Cleaner_Block_Adminhtml_Cache extends Mage_Adminhtml_Block_Template
 {
-    public function getMageTablesUrl()
+    public function getMagentoTablesUrl()
     {
-        return $this->getUrl('*/*/mageTables');
+        return $this->getUrl('*/*/magentoTables');
     }
 
-    public function getMageDirUrl()
+    public function getMagentoDirectoriesUrl()
     {
-        return $this->getUrl('*/*/mageDir');
+        return $this->getUrl('*/*/magentoDirectories');
     }
 
     public function getRedisUrl()
diff --git a/app/code/community/Kasterweb/Cleaner/Model/Job.php b/app/code/community/Kasterweb/Cleaner/Model/Job.php
@@ -2,6 +2,16 @@
 
 class Kasterweb_Cleaner_Model_Job extends Mage_Core_Model_Abstract
 {
+    public function performMagentoTables()
+    {
+        return Mage::getSingleton('cleaner/magentoDatabase')->truncate();
+    }
+
+    public function performMagentoDirectories()
+    {
+        return Mage::getSingleton('cleaner/magentoDirectories')->truncate();
+    }
+
     public function performRedis()
     {
         return Mage::getSingleton('cleaner/redis')->truncate();
diff --git a/app/code/community/Kasterweb/Cleaner/Model/Memcached.php b/app/code/community/Kasterweb/Cleaner/Model/Memcached.php
@@ -15,7 +15,7 @@ public function truncate()
             throw new InvalidArgumentException('Any socket path was found. Please set it in System > Configuration > Kasterweb > Cleaner > Memcached -> Socket path');
         }
         foreach ($socketsPaths as $socketPath) {
-            $returns[] = shell_exec(sprintf('echo "flush_all" | nc -U %s', $socketPath));
+            $returns[] = shell_exec(sprintf('echo "flush_all" | nc -U %s 2>&1', $socketPath));
         }
         return $returns;
     }
diff --git a/app/code/community/Kasterweb/Cleaner/Model/Redis.php b/app/code/community/Kasterweb/Cleaner/Model/Redis.php
@@ -13,6 +13,6 @@ public function truncate()
         if (empty($socketPath)) {
             throw new InvalidArgumentException('Empty socket path. Please set it in System > Configuration > Kasterweb > Cleaner > Redis -> Socket path');
         }
-        return shell_exec(sprintf('redis-cli -s %s flushall', $socketPath));
+        return shell_exec(sprintf('redis-cli -s %s flushall 2>&1', $socketPath));
     }
 }
diff --git a/app/code/community/Kasterweb/Cleaner/controllers/Adminhtml/CacheController.php b/app/code/community/Kasterweb/Cleaner/controllers/Adminhtml/CacheController.php
@@ -10,7 +10,7 @@ public function indexAction()
 			->renderLayout();
 	}
 
-	public function mageTablesAction()
+	public function magentoTablesAction()
 	{
 		$database = Mage::getSingleton('cleaner/magentoDatabase');
 		$truncatedTables = $database->truncate();
@@ -20,7 +20,7 @@ public function mageTablesAction()
 		$this->_redirect('*/*');
 	}
 
-	public function mageDirAction()
+	public function magentoDirectoriesAction()
 	{
 		$directories = Mage::getModel('cleaner/magentoDirectories');
 		try {
diff --git a/app/code/community/Kasterweb/Cleaner/etc/config.xml b/app/code/community/Kasterweb/Cleaner/etc/config.xml
@@ -2,7 +2,7 @@
 <config>
     <modules>
         <Kasterweb_Cleaner>
-            <version>1.0.2</version>
+            <version>1.1.0</version>
         </Kasterweb_Cleaner>
     </modules>
     <global>
@@ -86,17 +86,33 @@
     </adminhtml>
     <crontab>
         <jobs>
+            <cleaner_magento_tables>
+                <schedule>
+                    <cron_expr>0 23 * * 6</cron_expr>
+                </schedule>
+                <run>
+                    <model>cleaner/job::performMagentoTables</model>
+                </run>
+            </cleaner_magento_tables>
+            <cleaner_magento_directories>
+                <schedule>
+                    <cron_expr>0 23 * * 6</cron_expr>
+                </schedule>
+                <run>
+                    <model>cleaner/job::performMagentoDirectories</model>
+                </run>
+            </cleaner_magento_directories>
             <cleaner_redis>
                 <schedule>
-                    <cron_expr>*/5 * * * *</cron_expr>
+                    <cron_expr>0 23 * * *</cron_expr>
                 </schedule>
                 <run>
                     <model>cleaner/job::performRedis</model>
                 </run>
             </cleaner_redis>
             <cleaner_memcached>
                 <schedule>
-                    <cron_expr>*/5 * * * *</cron_expr>
+                    <cron_expr>0 23 * * *</cron_expr>
                 </schedule>
                 <run>
                     <model>cleaner/job::performMemcached</model>
diff --git a/app/design/adminhtml/default/default/layout/cleaner.xml b/app/design/adminhtml/default/default/layout/cleaner.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<layout version="1.0.2">
+<layout version="1.1.0">
     <cleaner_adminhtml_cache_index>
         <reference name="head">
             <action method="addItem">
diff --git a/app/design/adminhtml/default/default/template/cleaner/cache.phtml b/app/design/adminhtml/default/default/template/cleaner/cache.phtml
@@ -11,7 +11,7 @@
 <table class="form-list">
     <tr>
         <td class="scope-label">
-            <button onclick="setLocation('<?php echo $this->getMageTablesUrl(); ?>')" type="button" class="scalable">
+            <button onclick="setLocation('<?php echo $this->getMagentoTablesUrl(); ?>')" type="button" class="scalable">
                 <span><span>
                 <span><?php echo Mage::helper('cleaner')->__('Flush Magento Tables'); ?></span>
                 </span></span>
@@ -23,7 +23,7 @@
     </tr>
     <tr>
         <td class="scope-label">
-            <button onclick="setLocation('<?php echo $this->getMageDirUrl(); ?>')" type="button" class="scalable">
+            <button onclick="setLocation('<?php echo $this->getMagentoDirectoriesUrl(); ?>')" type="button" class="scalable">
                 <span><span>
                 <span><?php echo Mage::helper('cleaner')->__('Flush Magento Directories'); ?></span>
                 </span></span>
diff --git a/app/etc/modules/Kasterweb_Cleaner.xml b/app/etc/modules/Kasterweb_Cleaner.xml
@@ -4,7 +4,7 @@
         <Kasterweb_Cleaner>
             <active>true</active>
             <codePool>community</codePool>
-            <version>1.0.2</version>
+            <version>1.1.0</version>
         </Kasterweb_Cleaner>
     </modules>
 </config>
diff --git a/package.xml b/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package>
     <name>Kasterweb_Cleaner</name>
-    <version>1.0.2</version>
+    <version>1.1.0</version>
     <stability>stable</stability>
     <license uri="https://github.com/kasterweb/kasterweb-magento-cleaner/blob/master/LICENSE">MIT</license>
     <channel>community</channel>
@@ -15,9 +15,9 @@
  - Memcached cache through socket;&#xD;
  - EdgeCast CDN (HTTP Large) through API;</notes>
     <authors><author><name>Kasterweb</name><user>kasterweb</user><email>atendimento@kasterweb.com.br</email></author></authors>
-    <date>2015-12-10</date>
-    <time>20:44:28</time>
-    <contents><target name="magecommunity"><dir name="Kasterweb"><dir name="Cleaner"><dir name="Block"><dir name="Adminhtml"><file name="Cache.php" hash="436720af5aab691f84d66a30dcc0153f"/></dir></dir><dir name="Helper"><file name="Data.php" hash="d33b0c71789d72ae65dbda3f937bec7a"/></dir><dir name="Model"><file name="Cdn.php" hash="b1c3266c80d74ff335bad83065c4a686"/><file name="Job.php" hash="f982c8e9d55527fd5a071f8e8cef8bbf"/><file name="MagentoDatabase.php" hash="4f3226751fe3fabe1631956ba2919baa"/><file name="MagentoDirectories.php" hash="50355d7e580e457a98c4c701d20679b6"/><file name="Memcached.php" hash="4044dec71a84333381b2bfd0b282851a"/><file name="Redis.php" hash="a69719caa05dcceee6d1c515288488f2"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="CacheController.php" hash="22ff2593b3f6f6968d8d0e6c7f098946"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="f5fbb178c389a61b3df13bbdb2f231f6"/><file name="config.xml" hash="6c2a2686fd8d4a983c459f79a283a831"/><file name="system.xml" hash="bcdee9d6f04ca9a8ebc02d8367bbecee"/></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="cleaner.xml" hash="3f24030e26211724108c8303ab426a9d"/></dir><dir name="template"><dir name="cleaner"><file name="cache.phtml" hash="6c1f624d7d7074e26fe00cdaf00003ff"/></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Kasterweb_Cleaner.xml" hash="3afe84c79160c339620f69ec29073954"/></dir></target><target name="magelocale"><dir name="en_US"><file name="Kasterweb_Cleaner.csv" hash="f4258c3f68029c1df2d25ec9dae0c8fc"/></dir><dir name="pt_BR"><file name="Kasterweb_Cleaner.csv" hash="124463a77adfe80f14058e5186a3203f"/></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="cleaner"><dir name="css"><file name="cleaner.css" hash="9d582a980f9f539436a90b5c48f45400"/></dir></dir></dir></dir></dir></target></contents>
+    <date>2015-12-11</date>
+    <time>13:00:54</time>
+    <contents><target name="magecommunity"><dir name="Kasterweb"><dir name="Cleaner"><dir name="Block"><dir name="Adminhtml"><file name="Cache.php" hash="b4d5e5ba30a6ebbc513509b5fc0671c1"/></dir></dir><dir name="Helper"><file name="Data.php" hash="d33b0c71789d72ae65dbda3f937bec7a"/></dir><dir name="Model"><file name="Cdn.php" hash="b1c3266c80d74ff335bad83065c4a686"/><file name="Job.php" hash="ccb3e1749296d6478d6f3a87417d9b8b"/><file name="MagentoDatabase.php" hash="4f3226751fe3fabe1631956ba2919baa"/><file name="MagentoDirectories.php" hash="50355d7e580e457a98c4c701d20679b6"/><file name="Memcached.php" hash="46a7ef2fdf433b13fa4c9846f321bb8e"/><file name="Redis.php" hash="fdc1dcaa765e4568e122ae1b40ed6695"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="CacheController.php" hash="4ae8ccf33a8af8b5f9f83ad64b606595"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="f5fbb178c389a61b3df13bbdb2f231f6"/><file name="config.xml" hash="4b93937343e2df75639db6f954d6f18c"/><file name="system.xml" hash="bcdee9d6f04ca9a8ebc02d8367bbecee"/></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="cleaner.xml" hash="3b69fe4e7812690ea42e2ca759f59856"/></dir><dir name="template"><dir name="cleaner"><file name="cache.phtml" hash="cd2b6634bf1065d0e8cf1f61af28305e"/></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Kasterweb_Cleaner.xml" hash="602c02cc8a73d8c5f75360f58c85ff93"/></dir></target><target name="magelocale"><dir name="en_US"><file name="Kasterweb_Cleaner.csv" hash="f4258c3f68029c1df2d25ec9dae0c8fc"/></dir><dir name="pt_BR"><file name="Kasterweb_Cleaner.csv" hash="124463a77adfe80f14058e5186a3203f"/></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="cleaner"><dir name="css"><file name="cleaner.css" hash="9d582a980f9f539436a90b5c48f45400"/></dir></dir></dir></dir></dir></target></contents>
     <compatible/>
     <dependencies><required><php><min>5.3.0</min><max>10.0.0</max></php><package><name/><channel>connect.magentocommerce.com/core</channel><min/><max/></package><extension><name>Core</name><min/><max/></extension><extension><name>SPL</name><min/><max/></extension><extension><name>curl</name><min/><max/></extension></required></dependencies>
 </package>

Original file line number	Diff line number	Diff line change
`@@ -2,14 +2,14 @@`
`2`	`2`
`3`	`3`	`class Kasterweb_Cleaner_Block_Adminhtml_Cache extends Mage_Adminhtml_Block_Template`
`4`	`4`	`{`
`5`		`- public function getMageTablesUrl()`
	`5`	`+ public function getMagentoTablesUrl()`
`6`	`6`	`{`
`7`		`- return $this->getUrl('//mageTables');`
	`7`	`+ return $this->getUrl('//magentoTables');`
`8`	`8`	`}`
`9`	`9`
`10`		`- public function getMageDirUrl()`
	`10`	`+ public function getMagentoDirectoriesUrl()`
`11`	`11`	`{`
`12`		`- return $this->getUrl('//mageDir');`
	`12`	`+ return $this->getUrl('//magentoDirectories');`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`public function getRedisUrl()`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public function truncate()`
`15`	`15`	`throw new InvalidArgumentException('Any socket path was found. Please set it in System > Configuration > Kasterweb > Cleaner > Memcached -> Socket path');`
`16`	`16`	`}`
`17`	`17`	`foreach ($socketsPaths as $socketPath) {`
`18`		`- $returns[] = shell_exec(sprintf('echo "flush_all" \| nc -U %s', $socketPath));`
	`18`	`+ $returns[] = shell_exec(sprintf('echo "flush_all" \| nc -U %s 2>&1', $socketPath));`
`19`	`19`	`}`
`20`	`20`	`return $returns;`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,6 @@ public function truncate()`
`13`	`13`	`if (empty($socketPath)) {`
`14`	`14`	`throw new InvalidArgumentException('Empty socket path. Please set it in System > Configuration > Kasterweb > Cleaner > Redis -> Socket path');`
`15`	`15`	`}`
`16`		`- return shell_exec(sprintf('redis-cli -s %s flushall', $socketPath));`
	`16`	`+ return shell_exec(sprintf('redis-cli -s %s flushall 2>&1', $socketPath));`
`17`	`17`	`}`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ public function indexAction()`
`10`	`10`	`->renderLayout();`
`11`	`11`	`}`
`12`	`12`
`13`		`- public function mageTablesAction()`
	`13`	`+ public function magentoTablesAction()`
`14`	`14`	`{`
`15`	`15`	`$database = Mage::getSingleton('cleaner/magentoDatabase');`
`16`	`16`	`$truncatedTables = $database->truncate();`
`@@ -20,7 +20,7 @@ public function mageTablesAction()`
`20`	`20`	`$this->_redirect('/');`
`21`	`21`	`}`
`22`	`22`
`23`		`- public function mageDirAction()`
	`23`	`+ public function magentoDirectoriesAction()`
`24`	`24`	`{`
`25`	`25`	`$directories = Mage::getModel('cleaner/magentoDirectories');`
`26`	`26`	`try {`