Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Reinit fresh config before flushing cache and immediately save config… #3533

Merged
merged 9 commits into from
Oct 3, 2023
Merged

Reinit fresh config before flushing cache and immediately save config… #3533

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5d1b854
Reinit fresh config before flushing cache and immediately save config…
colinmollenhour Sep 20, 2023
d1ade5b
Fix copy/paste mistake.. :(
colinmollenhour Sep 21, 2023
0b0d05f
Replace using cache record for locking with MySQL GET_LOCK function.
colinmollenhour Sep 20, 2023
43f0b48
Merge branch 'improve-stampede-prevention' into save-after-flush
colinmollenhour Sep 21, 2023
6fb757b
Change flush system cache button to 'Flush & Apply Updates' - applies…
colinmollenhour Sep 21, 2023
80d8d5b
Merge branch 'main' into save-after-flush
fballiano Sep 22, 2023
c329a3a
phpcs
fballiano Sep 22, 2023
7401eef
Merge branch 'main' into save-after-flush
fballiano Oct 2, 2023
b1f644d
Merge branch 'main' into save-after-flush
kiatng Oct 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion app/code/core/Mage/Adminhtml/controllers/CacheController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,12 @@ public function indexAction()
*/
public function flushAllAction()
{
Mage::dispatchEvent('adminhtml_cache_flush_all');
Mage::app()->getCacheInstance()->banUse('config');
Mage::getConfig()->reinit();
Mage::app()->getCacheInstance()->flush();
colinmollenhour marked this conversation as resolved.
Show resolved Hide resolved
Mage::app()->getCacheInstance()->unbanUse('config');
Mage::getConfig()->saveCache();
Mage::dispatchEvent('adminhtml_cache_flush_all');
$this->_getSession()->addSuccess(Mage::helper('adminhtml')->__("The cache storage has been flushed."));
$this->_redirect('*/*');
}
Expand All @@ -63,7 +67,11 @@ public function flushAllAction()
*/
public function flushSystemAction()
{
Mage::app()->getCacheInstance()->banUse('config');
Mage::getConfig()->reinit();
Mage::app()->cleanCache();
Mage::app()->getCacheInstance()->unbanUse('config');
Mage::getConfig()->saveCache();
Mage::dispatchEvent('adminhtml_cache_flush_system');
$this->_getSession()->addSuccess(Mage::helper('adminhtml')->__("The OpenMage cache storage has been flushed."));
$this->_redirect('*/*');
colinmollenhour marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
12 changes: 12 additions & 0 deletions app/code/core/Mage/Core/Model/Cache.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,6 +532,18 @@ public function banUse($typeCode)
return $this;
}

/**
* Enable cache usage for specific data type
*
* @param string $typeCode
* @return $this
*/
public function unbanUse($typeCode)
{
$this->_allowedCacheOptions[$typeCode] = false;
return $this;
}

/**
* Get cache tags by cache type from configuration
*
Expand Down
Loading