Check for instanceIds when checking for currently running archive processes #16974
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
tsteur
added
not-in-changelog
diosmosis
reviewed
Dec 17, 2020
| $lines = array_filter($lines, function ($line) use ($instanceId) { | ||
| if (!empty($instanceId) && strpos($line, 'matomo-domain=' . $instanceId) === false) { | ||
| return false; | ||
| } |
There was a problem hiding this comment.
not sure if this is a problem for cloud, but should we also check if empty($instanceId) && strpos($line, 'matomo-domain=') !== false? Will merge regardless after tests run, just thought it might be important.
There was a problem hiding this comment.
it should be not needed. When an instanceId is configured in the config, then we expect it to be always called with matomo-domain. And if no instanceId is set we assume it doesn't matter.
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.
Description:
fix #16973
Review