-
-
Notifications
You must be signed in to change notification settings - Fork 581
[5.x] Fix static caching invalidation for multi-sites #10517
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.
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
Closed
Closed
Conversation
This file contains hidden or 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
Co-authored-by: duncanmcclean <duncanmcclean@users.noreply.github.com> Co-authored-by: Jason Varga <jason@pixelfear.com>
Co-authored-by: Duncan McClean <duncan@duncanmcclean.com> Co-authored-by: Jason Varga <jason@pixelfear.com>
Co-authored-by: Jason Varga <jason@pixelfear.com>
Co-authored-by: John Koster <john@stillat.com>
* add dark mode bg-color for little dot * adjust widgets header icon color for dark mode * change cp widgets svg color
Co-authored-by: Jason Varga <jason@pixelfear.com>
Co-authored-by: Jelle Roorda <info@roordaict.nl> Co-authored-by: Jason Varga <jason@pixelfear.com>
…e` middleware (#9406) Co-authored-by: Jason Varga <jason@pixelfear.com>
Co-authored-by: Jason Varga <jason@pixelfear.com>
#10654) Co-authored-by: Jason Varga <jason@pixelfear.com>
Co-authored-by: Jason Varga <jason@pixelfear.com>
Co-authored-by: Duncan McClean <duncan@duncanmcclean.com> Co-authored-by: Jason Varga <jason@pixelfear.com>
* remove duplicated key * translate statamic * dictionaries translation * label translation * Update Persian translation * update translation
* Azerbaijani translation * fix php linter errors * Update Azerbaijani translation * reformat json * update translation
* Update turkish dictionary * label translation * Update Turkish translation * update old translation * remove duplicate * update translation
…m:statamic/cms into fix/multisite-static-caching-invalidation
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 pull request fixes some issues around Static Caching invalidation & Multi-sites, when the queue driver is set to anything other than
sync
.When the
DefaultInvalidator
class passes down the invalidation rules from the config, it does so without specifying the domain in which the URLs should be invalidated.cms/src/StaticCaching/DefaultInvalidator.php
Lines 70 to 72 in fd24694
The
invalidateUrls
method attempts to get the domain from the invalidation URLs in the config (which is why the mentioned workaround works).When an invalidation rule doesn't include a domain, it'll attempt to get the site's "base URL" using
AbstractCacher::getBaseUrl()
:cms/src/StaticCaching/Cachers/AbstractCacher.php
Lines 49 to 62 in fd24694
This method then calls
Site::current()
which gets the domain by getting the current site, based on the request URL.However, since we're in the context of a queue, there is no request, so Statamic falls back to the "default" site URL, which causes the path on the intended site to not get invalidated (intended being the site the entry is associated with).
This pull request attempts to fix this by including the domain in the array of URLs passed to
invalidateUrls
.Fixes #7691.