DIS 250: Fixed Usage Tables Not Aggregating Data Properly #2212
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
mdnoble73
requested changes
Jan 22, 2025
code/web/Action.php
Outdated
| @@ -117,6 +117,8 @@ protected function forbidAPIAccess() | |||
| try{ | |||
| $usageByIPAddress->numBlockedApiRequests++; | |||
| if (SystemVariables::getSystemVariables()->trackIpAddresses) { | |||
| // This will match that specific IP/year/month/instance row. | |||
There was a problem hiding this comment.
@LeoStoyanovByWater it looks like this is using incorrect indenting. Can you correct to use tabs?
code/web/Action.php
Outdated
| @@ -117,6 +117,8 @@ protected function forbidAPIAccess() | |||
| try{ | |||
| $usageByIPAddress->numBlockedApiRequests++; | |||
| if (SystemVariables::getSystemVariables()->trackIpAddresses) { | |||
| // This will match that specific IP/year/month/instance row. | |||
| $usageByIPAddress->find(true); | |||
There was a problem hiding this comment.
@LeoStoyanovByWater this search will need to be done before the number of blocked requests is incremented
install/aspen.sql
Outdated
| @@ -5732,7 +5732,7 @@ CREATE TABLE `usage_by_user_agent` ( | |||
| `numRequests` int(11) NOT NULL DEFAULT 0, | |||
| `numBlockedRequests` int(11) NOT NULL DEFAULT 0, | |||
| PRIMARY KEY (`id`), | |||
| KEY `userAgentId` (`userAgentId`,`year`,`instance`,`month`) | |||
| UNIQUE KEY `userAgentId` (`userAgentId`,`year`,`instance`,`month`) | |||
There was a problem hiding this comment.
These changes need to be done with a database update rather than by simply modifying the default database
LeoStoyanovByWater
force-pushed
the
25.02.00
branch
from
6479440 to
d1bbd0b
Compare
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.
(userAgentId, year, month, instance)forusage_by_user_agent.$usageByUserAgent->find(true)before incrementing request counters.$usageByIPAddress->find(true)in various files before DB updates.bootstrap.phpto update IP Address request counter.To test: