Skip to content

Commit

Permalink
fixed #28
Browse files Browse the repository at this point in the history
  • Loading branch information
@m1ngyuan
m1ngyuan committed Apr 11, 2020
1 parent 03f1560 commit f16b770
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
18 changes: 9 additions & 9 deletions ...er/src/main/java/com/alibaba/cloud/spring/boot/rds/actuate/endpoint/RdsErrorEndpoint.java
View file
Expand Up @@ -42,40 +42,40 @@ public class RdsErrorEndpoint extends AbstractInvoker {
private static final Long TIME_RANGE = 7L * 24 * 60 * 60 * 1000;

@ReadOperation
public Map<String, List<DescribeErrorLogsResponse.ErrorLog>> error() {
public Map<String, List<DescribeErrorLogsResponse.ErrorLog>> describeErrorLogsWithInstances() {
List<DescribeDBInstancesResponse.DBInstance> instances = getInstances();
Map<String, List<DescribeErrorLogsResponse.ErrorLog>> map = instances.stream()
.collect(Collectors.toMap(
DescribeDBInstancesResponse.DBInstance::getDBInstanceId,
this::error));
this::describeErrorLogsWithInstances));
return map;
}

@ReadOperation
public List<DescribeErrorLogsResponse.ErrorLog> errors(@Selector String instanceId) {
public List<DescribeErrorLogsResponse.ErrorLog> describeErrorLogsWithInstance(@Selector String instanceId) {
DescribeDBInstancesResponse.DBInstance instance = getInstance(instanceId);
return error(instance);
return describeErrorLogsWithInstances(instance);
}

@ReadOperation
public List<DescribeErrorLogsResponse.ErrorLog> error(@Selector String instanceId,
public List<DescribeErrorLogsResponse.ErrorLog> describeErrorLogsWithInstanceAndTimeRange(@Selector String instanceId,
@Selector String start, @Selector String end) {
DescribeDBInstancesResponse.DBInstance instance = getInstance(instanceId);
return error(instance, start, end);
return describeErrorLogsWithInstanceAndTimeRange(instance, start, end);
}

private List<DescribeErrorLogsResponse.ErrorLog> error(
private List<DescribeErrorLogsResponse.ErrorLog> describeErrorLogsWithInstances(
DescribeDBInstancesResponse.DBInstance instance) {

SimpleDateFormat format = new SimpleDateFormat(TIME_PATTEN);

Date end = new Date();
Date start = new Date(end.getTime() - TIME_RANGE);

return error(instance, format.format(start), format.format(end));
return describeErrorLogsWithInstanceAndTimeRange(instance, format.format(start), format.format(end));
}

private List<DescribeErrorLogsResponse.ErrorLog> error(
private List<DescribeErrorLogsResponse.ErrorLog> describeErrorLogsWithInstanceAndTimeRange(
DescribeDBInstancesResponse.DBInstance instance, String start, String end) {
if (instance == null) {
return Collections.emptyList();
Expand Down
4 changes: 2 additions & 2 deletions .../main/java/com/alibaba/cloud/spring/boot/rds/actuate/endpoint/RdsPerformanceEndpoint.java
View file
Expand Up @@ -62,7 +62,7 @@ public class RdsPerformanceEndpoint extends AbstractInvoker {
private RdsProperties rdsProperties;

@ReadOperation
public Map<String, Object> performance() {
public Map<String, Object> describeDBWithInstances() {
Map<String, Object> map = new LinkedHashMap<>();

List<DescribeDBInstancesResponse.DBInstance> instances = getInstances();
Expand All @@ -76,7 +76,7 @@ public Map<String, Object> performance() {
}

@ReadOperation
public Map<String, Object> performance(@Selector String instanceId) {
public Map<String, Object> describeDBWithInstance(@Selector String instanceId) {
DescribeDBInstancesResponse.DBInstance instance = getInstance(instanceId);
if (instance == null) {
return null;
Expand Down
12 changes: 6 additions & 6 deletions ...ter/src/main/java/com/alibaba/cloud/spring/boot/rds/actuate/endpoint/RdsSlowEndpoint.java
View file
Expand Up @@ -44,7 +44,7 @@ public class RdsSlowEndpoint extends AbstractInvoker {
private static final Long TIME_RANGE = 7L * 24 * 60 * 60 * 1000;

@ReadOperation
public Map<String, List<DescribeSlowLogsResponse.SQLSlowLog>> slow() {
public Map<String, List<DescribeSlowLogsResponse.SQLSlowLog>> describeSlowLogsWithInstances() {
List<DescribeDBInstancesResponse.DBInstance> instances = getInstances();
Map<String, List<DescribeSlowLogsResponse.SQLSlowLog>> map = instances.stream()
.collect(Collectors.toMap(
Expand All @@ -55,16 +55,16 @@ public Map<String, List<DescribeSlowLogsResponse.SQLSlowLog>> slow() {
}

@ReadOperation
public List<DescribeSlowLogsResponse.SQLSlowLog> slow(@Selector String instanceId) {
public List<DescribeSlowLogsResponse.SQLSlowLog> describeSlowLogsWithInstance(@Selector String instanceId) {
DescribeDBInstancesResponse.DBInstance instance = getInstance(instanceId);
return slow(instance);
}

@ReadOperation
public List<DescribeSlowLogsResponse.SQLSlowLog> slow(@Selector String instanceId,
public List<DescribeSlowLogsResponse.SQLSlowLog> describeSlowLogsWithInstanceAndTimeRange(@Selector String instanceId,
@Selector String start, @Selector String end) {
DescribeDBInstancesResponse.DBInstance instance = getInstance(instanceId);
return slow(instance, start, end);
return describeSlowLogs(instance, start, end);
}

private List<DescribeSlowLogsResponse.SQLSlowLog> slow(
Expand All @@ -75,10 +75,10 @@ private List<DescribeSlowLogsResponse.SQLSlowLog> slow(
Date end = new Date();
Date start = new Date(end.getTime() - TIME_RANGE);

return slow(instance, format.format(start), format.format(end));
return describeSlowLogs(instance, format.format(start), format.format(end));
}

private List<DescribeSlowLogsResponse.SQLSlowLog> slow(
private List<DescribeSlowLogsResponse.SQLSlowLog> describeSlowLogs(
DescribeDBInstancesResponse.DBInstance instance, @Selector String start,
@Selector String end) {
DescribeSlowLogsRequest request = new DescribeSlowLogsRequest();
Expand Down

0 comments on commit f16b770

Please sign in to comment.