Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[INLONG-4934][Bug] Reversed value for admin_enable_stats methods #4935

Merged
merged 1 commit into from
Jul 8, 2022
Merged

[INLONG-4934][Bug] Reversed value for admin_enable_stats methods #4935

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...q-server/src/main/java/org/apache/inlong/tubemq/server/broker/web/BrokerAdminServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1261,7 +1261,7 @@ public void adminDisableMetricsStats(HttpServletRequest req,
return;
}
String statsType = (String) result.getRetData();
innEnableOrDisableMetricsStats(true, statsType, req, sBuffer);
innEnableOrDisableMetricsStats(false, statsType, req, sBuffer);
}

/**
Expand Down Expand Up @@ -1305,7 +1305,7 @@ private void innEnableOrDisableMetricsStats(boolean enable,
if (count++ > 0) {
sBuffer.append(",");
}
sBuffer.append(metricType.getDesc());
sBuffer.append(metricType.getName());
}
sBuffer.append("]\"}");
return;
Expand Down
2 changes: 1 addition & 1 deletion ...-server/src/main/java/org/apache/inlong/tubemq/server/common/utils/WebParameterUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ public static boolean isValidPortsSet(int brokerPort, int brokerTlsPort,
.append(", the value of ")
.append(WebFieldDef.BROKERPORT.name).append(" or ")
.append(WebFieldDef.BROKERTLSPORT.name)
.append(" cannot be the same as the value of")
.append(" cannot be the same as the value of ")
.append(WebFieldDef.BROKERWEBPORT.name).toString());
strBuff.delete(0, strBuff.length());
return result.isSuccess();
Expand Down
2 changes: 1 addition & 1 deletion ...ain/java/org/apache/inlong/tubemq/server/master/web/handler/WebAdminGroupCtrlHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ public StringBuilder adminQueryConsumeGroupSetting(HttpServletRequest req,
.append("\",\"enableBind\":1,\"allowedBClientRate\":")
.append(entry.getAllowedBrokerClientRate())
.append(",\"attributes\":\"\",\"lastBindUsedDate\":\"-\"")
.append("\",\"dataVersionId\":").append(entry.getDataVerId())
.append(",\"dataVersionId\":").append(entry.getDataVerId())
.append(",\"createUser\":\"").append(entry.getCreateUser())
.append("\",\"createDate\":\"").append(entry.getCreateDateStr())
.append("\",\"modifyUser\":\"").append(entry.getModifyUser())
Expand Down
5 changes: 2 additions & 3 deletions ...src/main/java/org/apache/inlong/tubemq/server/master/web/handler/WebOtherInfoHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ public StringBuilder adminDisableMetricsStats(HttpServletRequest req,
return sBuffer;
}
String statsType = (String) result.getRetData();
innEnableOrDisableMetricsStats(true, statsType, req, sBuffer, result);
innEnableOrDisableMetricsStats(false, statsType, req, sBuffer, result);
return sBuffer;
}

Expand Down Expand Up @@ -439,7 +439,7 @@ private StringBuilder innEnableOrDisableMetricsStats(boolean enable,
if (count++ > 0) {
sBuffer.append(",");
}
sBuffer.append(metricType.getDesc());
sBuffer.append(metricType.getName());
}
sBuffer.append("]\"}");
return sBuffer;
Expand Down Expand Up @@ -526,5 +526,4 @@ private void getConsumerInfoList(final List<ConsumerInfo> consumerList,
}
strBuffer.append("]");
}

}