zhuyijun/nacos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

code format and some code detail

Browse Source
This commit is contained in:
Nicholas2015 2019-06-04 17:10:27 +08:00
parent 20af90b821
commit bbb2108fd2
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
naming/src/main/java/com/alibaba/nacos/naming/controllers/ServiceController.java
View File

@ -370,21 +370,22 @@ public class ServiceController {
/**
* get subscriber list
*
* @param request
* @return
*/
@RequestMapping(value = "/subscribers", method = RequestMethod.GET)
public JSONObject subscribers(HttpServletRequest request){
public JSONObject subscribers(HttpServletRequest request) {
String namespaceId = WebUtils.optional(request, CommonParams.NAMESPACE_ID,
Constants.DEFAULT_NAMESPACE_ID);
String serviceName = WebUtils.required(request, CommonParams.SERVICE_NAME);
boolean aggregation = Boolean.valueOf(WebUtils.required(request,"aggregation"));
boolean aggregation = Boolean.valueOf(WebUtils.optional(request, "aggregation", String.valueOf(Boolean.TRUE)));
JSONObject result = new JSONObject();
try {
List<Subscriber> subscribers = subscribeManager.getSubscribers(serviceName,namespaceId,aggregation);
result.put("subscribers",subscribers);
List<Subscriber> subscribers = subscribeManager.getSubscribers(serviceName, namespaceId, aggregation);
result.put("subscribers", subscribers);
return result;
} catch (InterruptedException e) {

10
naming/src/main/java/com/alibaba/nacos/naming/core/SubscribeManager.java
View File

@ -38,11 +38,12 @@ import java.util.stream.Collectors;
/**
* @author Nicholas
* @since 1.0.1
*/
@Service
public class SubscribeManager {
private static final String DATA_ON_SYNC_URL = "/service/subscribers";
private static final String SUBSCRIBER_ON_SYNC_URL = "/service/subscribers";
@Autowired
private PushService pushService;
@ -67,8 +68,7 @@ public class SubscribeManager {
if (aggregation){
// size = 1 means only myself in the list, we need at least one another server alive:
while (serverListManager.getHealthyServers().size() <= 1) {
Thread.sleep(1000L);
Loggers.EPHEMERAL.info("waiting server list init...");
return getSubscribers(serviceName,namespaceId);
}
List<Subscriber> subscriberList = new ArrayList<Subscriber>();
@ -78,13 +78,13 @@ public class SubscribeManager {
Map<String, String> paramValues = new HashMap<>(128);
paramValues.put("serviceName",serviceName);
paramValues.put("namespaceId",namespaceId);
paramValues.put("aggregation",String.valueOf(!aggregation));
paramValues.put("aggregation",String.valueOf(Boolean.FALSE));
if (NetUtils.localServer().equals(server.getKey())) {
subscriberList.addAll(getSubscribers(serviceName,namespaceId));
}
HttpClient.HttpResult result = HttpClient.httpGet("http://" + server.getKey() + RunningConfig.getContextPath()
+ UtilsAndCommons.NACOS_NAMING_CONTEXT + DATA_ON_SYNC_URL, new ArrayList<>(),paramValues);
+ UtilsAndCommons.NACOS_NAMING_CONTEXT + SUBSCRIBER_ON_SYNC_URL, new ArrayList<>(),paramValues);
if (HttpURLConnection.HTTP_OK == result.code) {
Subscribers subscribers = (Subscribers) JSONObject.parseObject(result.content, Subscribers.class);