fizzgate/fizz-gateway-node
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: some bug

Browse Source
This commit is contained in:
hongqiaowei
2021-01-13 16:17:32 +08:00
parent 6aae33404e
commit f12e21b572
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/we/filter/FlowControlFilter.java
View File

@@ -80,7 +80,7 @@ public class FlowControlFilter extends ProxyAggrFilter {
boolean concurrentOrRpsExceed = false; boolean concurrentOrRpsExceed = false;
boolean globalExceed = concurrentOrRpsExceed; boolean globalExceed = concurrentOrRpsExceed;
if (rlc != null && rlc.isEnable()) { if (rlc.isEnable()) {
concurrentOrRpsExceed = !flowStat.incrRequest(rlc.resource, currentTimeSlot, rlc.concurrents, rlc.qps); concurrentOrRpsExceed = !flowStat.incrRequest(rlc.resource, currentTimeSlot, rlc.concurrents, rlc.qps);
globalExceed = concurrentOrRpsExceed; globalExceed = concurrentOrRpsExceed;
} }
@@ -112,7 +112,7 @@ public class FlowControlFilter extends ProxyAggrFilter {
} }
} }
if ((globalConfig == null && rlc == null) || (globalConfig == null && !rlc.isEnable()) || (rlc == null && !globalConfig.isEnable())) { if ( !globalConfig.isEnable() && ( rlc == null || (rlc.type == ResourceRateLimitConfig.Type.SERVICE_DEFAULT && !rlc.isEnable()) ) ) {
flowStat.incrRequest(ResourceRateLimitConfig.GLOBAL, currentTimeSlot, Long.MAX_VALUE, Long.MAX_VALUE); flowStat.incrRequest(ResourceRateLimitConfig.GLOBAL, currentTimeSlot, Long.MAX_VALUE, Long.MAX_VALUE);
flowStat.incrRequest(service, currentTimeSlot, Long.MAX_VALUE, Long.MAX_VALUE); flowStat.incrRequest(service, currentTimeSlot, Long.MAX_VALUE, Long.MAX_VALUE);
// flowStat.incrRequest(reqPath, currentTimeSlot, Long.MAX_VALUE, Long.MAX_VALUE); // flowStat.incrRequest(reqPath, currentTimeSlot, Long.MAX_VALUE, Long.MAX_VALUE);