move the HTTPPurgePlugin to frontend and adminhtml instead from globa…

…l. global will intercept static.php 404 process, cause exception.
litespeedtech · Jan 23, 2017 · d1fcea2 · d1fcea2
1 parent c31e357
commit d1fcea2
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 34 deletions.
diff --git a/Model/App/FrontController/LitemagePlugin.php b/Model/App/FrontController/LitemagePlugin.php
@@ -69,7 +69,7 @@ public function aroundDispatch(
         \Magento\Framework\App\RequestInterface $request
     ) {
         $response = $proceed($request);
-        $this->litemageCache->debugLog('process dispatch action =' . $request->getActionName());
+        $this->litemageCache->debugLog('process dispatch action=' . $request->getActionName());
         if ($this->litemageCache->moduleEnabled() && $response instanceof ResponseHttp) {
             $this->version->process();
         }

diff --git a/Model/CacheControl.php b/Model/CacheControl.php
@@ -126,6 +126,11 @@ public function debugEnabled()
     {
         return $this->_debug;
     }
+
+	public function needPurge()
+	{
+		return ($this->_moduleEnabled && !empty($this->_purgeTags));
+	}
 
 	/**
 	 * Add purgeable tags

diff --git a/composer.json b/composer.json
@@ -7,7 +7,7 @@
         "magento/framework": "100.0.*|100.1.*|100.2.*"
     },
     "type": "magento2-module",
-    "version": "2.0.3",
+    "version": "2.0.4",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/etc/adminhtml/di.xml b/etc/adminhtml/di.xml
@@ -27,4 +27,7 @@
     <type name="Magento\PageCache\Model\System\Config\Source\Application">
         <plugin name="pagecache-system-source-litemage" type="Litespeed\Litemage\Model\System\Config\Source\ApplicationPlugin" sortOrder="1"/>
     </type>
+    <type name="\Magento\Framework\App\Response\Http">
+        <plugin name="response-http-litemage-purge" type="\Litespeed\Litemage\Model\App\Response\HttpPurgePlugin" sortOrder="10"/>
+    </type>
 </config>
diff --git a/etc/di.xml b/etc/di.xml
diff --git a/etc/frontend/di.xml b/etc/frontend/di.xml
@@ -34,6 +34,7 @@
         <plugin name="view-layout-litemage" type="\Litespeed\Litemage\Model\Layout\LayoutPlugin"/>
     </type>
     <type name="\Magento\Framework\App\Response\Http">
-        <plugin name="response-http-litemage" type="\Litespeed\Litemage\Model\App\Response\HttpPlugin" sortOrder="10"/>
+        <plugin name="response-http-litemage-purge" type="\Litespeed\Litemage\Model\App\Response\HttpPurgePlugin" sortOrder="10"/>
+        <plugin name="response-http-litemage" type="\Litespeed\Litemage\Model\App\Response\HttpPlugin" sortOrder="20"/>
     </type>
 </config>
diff --git a/etc/module.xml b/etc/module.xml
@@ -24,7 +24,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Litespeed_Litemage" setup_version="2.0.3">
+    <module name="Litespeed_Litemage" setup_version="2.0.4">
         <sequence>
             <module name="Magento_PageCache"/>
         </sequence>