Repair step to clear frontend related caches #8144
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## master #8144 +/- ##
=============================================
- Coverage 51.73% 35.07% -16.67%
- Complexity 25357 25362 +5
=============================================
Files 1598 1599 +1
Lines 95021 95057 +36
Branches 1376 1376
=============================================
- Hits 49160 33339 -15821
- Misses 45861 61718 +15857
|
rullzer
previously requested changes
Feb 2, 2018
| $output->info('Image cache cleared'); | ||
|
|
||
| $this->scssCacher->resetCache(); | ||
| $c = $this->cacheFactory->createDistributed('SCSS'); |
There was a problem hiding this comment.
Wouldn't it make more sense to do this in the scssCacher? I would expect if I call the reset cache function that also the Memorycache is cleared.
There was a problem hiding this comment.
Ah yes. Just moved that over and added tests for those methods as well.
| $output->info('SCSS cache cleared'); | ||
|
|
||
| $this->jsCombiner->resetCache(); | ||
| $c = $this->cacheFactory->createDistributed('JS'); |
juliusknorr
force-pushed
the
cache-update-occ
branch
from
b2bfce2
to
5ad3a39
Compare
rullzer
reviewed
Feb 3, 2018
lib/private/Template/JSCombiner.php
Outdated
| public function resetCache() { | ||
| $this->depsCache->clear(); | ||
| $appDirectory = $this->appData->getDirectoryListing(); | ||
| if(empty($appDirectory)){ |
There was a problem hiding this comment.
Not really needed if you just loop over the array in the next step. But doesn't hurt.
There was a problem hiding this comment.
Ok, removed them as well.
|
Can you rebase upon master? Now that my fix is in. I just want green CI to be sure. |
rullzer
approved these changes
Feb 3, 2018
Signed-off-by: Julius Härtl <[email protected]>
Signed-off-by: Julius Härtl <[email protected]>
Signed-off-by: Julius Härtl <[email protected]>
juliusknorr
force-pushed
the
cache-update-occ
branch
from
5ad3a39
to
b87e5a0
Compare
|
Rebased. |
Signed-off-by: Roeland Jago Douma <[email protected]>
|
Failure is unrelated. |
skjnldsv
added
the
feature: caching
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR adds a repair step that will be executed during update and when calling occ maintenance:repair, that will remove any frontend related caches that caused issues in the past, as:
I also added some further logging to the SCSSCacher and the JSCombiner, so at least logs can tell if something was wrong there.
The initial idea was from #7984 to pregenerate files, but that would be a lot more logic to be implemented, since the list of js/css files is built dynamically on every request. Clearing those files from appdata should be enough there.