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

StatPluginFilter should sync the change if current gateway group is modified

Browse Source
This commit is contained in:
hongqiaowei
2021-09-29 15:50:28 +08:00
parent 3b036d402b
commit 66cfd4549c
2 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
fizz-core/src/main/java/we/plugin/auth/GatewayGroupService.java
View File

@@ -24,6 +24,7 @@ import org.springframework.data.redis.core.ReactiveStringRedisTemplate;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
import we.FizzAppContext;
import we.config.AggregateRedisConfig; import we.config.AggregateRedisConfig;
import we.flume.clients.log4j2appender.LogService; import we.flume.clients.log4j2appender.LogService;
import we.util.Consts; import we.util.Consts;
@@ -165,8 +166,7 @@ public class GatewayGroupService {
return Mono.just(ReactorUtils.EMPTY_THROWABLE); return Mono.just(ReactorUtils.EMPTY_THROWABLE);
} }
private void updateGatewayGroupMap(GatewayGroup gg, Map<String, GatewayGroup> gatewayGroupMap, private void updateGatewayGroupMap(GatewayGroup gg, Map<String, GatewayGroup> gatewayGroupMap, Set<String> currentGatewayGroupSet) {
Set<String> currentGatewayGroupSet) {
if (gg.isDeleted == GatewayGroup.DELETED) { if (gg.isDeleted == GatewayGroup.DELETED) {
GatewayGroup r = gatewayGroupMap.remove(gg.group); GatewayGroup r = gatewayGroupMap.remove(gg.group);
log.info("remove " + r); log.info("remove " + r);
@@ -182,8 +182,7 @@ public class GatewayGroupService {
updateCurrentGatewayGroupSet(currentGatewayGroupSet, gatewayGroupMap); updateCurrentGatewayGroupSet(currentGatewayGroupSet, gatewayGroupMap);
} }
private void updateCurrentGatewayGroupSet(Set<String> currentGatewayGroupSet, Map<String, private void updateCurrentGatewayGroupSet(Set<String> currentGatewayGroupSet, Map<String, GatewayGroup> gatewayGroupMap) {
GatewayGroup> gatewayGroupMap) {
Set<String> ips = NetworkUtils.getServerIps(); Set<String> ips = NetworkUtils.getServerIps();
String applicationName = environment.getProperty("spring.application.name"); String applicationName = environment.getProperty("spring.application.name");
currentGatewayGroupSet.clear(); currentGatewayGroupSet.clear();
@@ -199,6 +198,7 @@ public class GatewayGroupService {
if (currentGatewayGroupSet.isEmpty()) { if (currentGatewayGroupSet.isEmpty()) {
currentGatewayGroupSet.add(GatewayGroup.DEFAULT); currentGatewayGroupSet.add(GatewayGroup.DEFAULT);
} }
// publish event
} }
public boolean currentGatewayGroupIn(Set<String> gatewayGroups) { public boolean currentGatewayGroupIn(Set<String> gatewayGroups) {

21
fizz-core/src/main/java/we/plugin/stat/StatPluginFilter.java
View File

@@ -71,6 +71,7 @@ public class StatPluginFilter extends PluginFilter {
@Resource @Resource
private GatewayGroupService gatewayGroupService; private GatewayGroupService gatewayGroupService;
/*
private String currentGatewayGroups; private String currentGatewayGroups;
@PostConstruct @PostConstruct
@@ -84,6 +85,7 @@ public class StatPluginFilter extends PluginFilter {
} }
} }
} }
*/
@Override @Override
public Mono<Void> doFilter(ServerWebExchange exchange, Map<String, Object> config, String fixedConfig) { public Mono<Void> doFilter(ServerWebExchange exchange, Map<String, Object> config, String fixedConfig) {
@@ -92,7 +94,7 @@ public class StatPluginFilter extends PluginFilter {
StringBuilder b = ThreadContext.getStringBuilder(); StringBuilder b = ThreadContext.getStringBuilder();
b.append(Consts.S.LEFT_BRACE); b.append(Consts.S.LEFT_BRACE);
b.append(ip); toJsonStringValue(b, WebUtils.getOriginIp(exchange)); b.append(Consts.S.COMMA); b.append(ip); toJsonStringValue(b, WebUtils.getOriginIp(exchange)); b.append(Consts.S.COMMA);
b.append(gatewayGroup); toJsonStringValue(b, currentGatewayGroups); b.append(Consts.S.COMMA); b.append(gatewayGroup); toJsonStringValue(b, currentGatewayGroups()); b.append(Consts.S.COMMA);
b.append(service); toJsonStringValue(b, WebUtils.getClientService(exchange)); b.append(Consts.S.COMMA); b.append(service); toJsonStringValue(b, WebUtils.getClientService(exchange)); b.append(Consts.S.COMMA);
String appId = WebUtils.getAppId(exchange); String appId = WebUtils.getAppId(exchange);
@@ -115,6 +117,23 @@ public class StatPluginFilter extends PluginFilter {
return WebUtils.transmitSuccessFilterResultAndEmptyMono(exchange, STAT_PLUGIN_FILTER, null); return WebUtils.transmitSuccessFilterResultAndEmptyMono(exchange, STAT_PLUGIN_FILTER, null);
} }
private String currentGatewayGroups() {
int sz = gatewayGroupService.currentGatewayGroupSet.size();
if (sz == 1) {
return gatewayGroupService.currentGatewayGroupSet.iterator().next();
}
StringBuilder b = ThreadContext.getStringBuilder();
byte i = 0;
for (String g : gatewayGroupService.currentGatewayGroupSet) {
b.append(g);
i++;
if (i < sz) {
b.append(Consts.S.COMMA);
}
}
return b.toString();
}
private static void toJsonStringValue(StringBuilder b, String value) { private static void toJsonStringValue(StringBuilder b, String value) {
b.append(Consts.S.DOUBLE_QUOTE).append(value).append(Consts.S.DOUBLE_QUOTE); b.append(Consts.S.DOUBLE_QUOTE).append(value).append(Consts.S.DOUBLE_QUOTE);
} }