yuluo-yx commented on code in PR #2495:
URL: https://github.com/apache/hertzbeat/pull/2495#discussion_r1709829774
##########
manager/src/main/resources/application.yml:
##########
@@ -18,7 +18,7 @@ spring:
application:
name: ${HOSTNAME:@hertzbeat@}${PID}
profiles:
- active: prod
+ active: dev
Review Comment:
Why change the configuration file here?
##########
manager/src/main/java/org/apache/hertzbeat/manager/controller/CollectorController.java:
##########
@@ -67,32 +67,15 @@ public ResponseEntity<Message<Page<CollectorSummary>>>
getCollectors(
@Parameter(description = "collector name", example = "tom")
@RequestParam(required = false) final String name,
@Parameter(description = "List current page", example = "0")
@RequestParam(defaultValue = "0") int pageIndex,
@Parameter(description = "Number of list pagination", example =
"8") @RequestParam(required = false) Integer pageSize) {
- if (pageSize == null) {
- pageSize = Integer.MAX_VALUE;
- }
- Specification<Collector> specification = (root, query,
criteriaBuilder) -> {
- Predicate predicate = criteriaBuilder.conjunction();
- if (name != null && !name.isEmpty()) {
- Predicate predicateName =
criteriaBuilder.like(root.get("name"), "%" + name + "%");
- predicate = criteriaBuilder.and(predicateName);
- }
- return predicate;
- };
- PageRequest pageRequest = PageRequest.of(pageIndex, pageSize);
- Page<CollectorSummary> receivers =
collectorService.getCollectors(specification, pageRequest);
- Message<Page<CollectorSummary>> message = Message.success(receivers);
- return ResponseEntity.ok(message);
+ return
ResponseEntity.ok(Message.success(collectorService.getCollectors(pageIndex,
pageSize, name)));
}
@PutMapping("/online")
@Operation(summary = "Online collectors")
public ResponseEntity<Message<Void>> onlineCollector(
@Parameter(description = "collector name", example =
"demo-collector")
@RequestParam(required = false) List<String> collectors) {
- if (collectors != null) {
- collectors.forEach(collector ->
-
this.manageServer.getCollectorAndJobScheduler().onlineCollector(collector));
- }
+ collectorService.online(collectors);
return ResponseEntity.ok(Message.success("Online success"));
Review Comment:
hi, Have you tested this interface? Does he return data properly?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
