error->Error

This commit is contained in:
liqiankun 2017-12-14 17:42:40 +08:00
parent da3f14e75a
commit 495fef85b0
2 changed files with 5 additions and 2 deletions

View File

@ -237,7 +237,7 @@ public class KubernetesAPI {
* 命令执行超时是返回error,或者查询出的结果不是指定格式的情况下
* 就使用配置文件中的配置做为结果返回
*/
if("error".equals(outPut) || !outPut.contains("CPU")){
if("Error".equals(outPut) || !outPut.contains("CPU")){
sumUsage.put("cpuUsage",Integer.parseInt(appConfig.getCpuCapacity())*1000.0);
sumUsage.put("memoryUsage",Integer.parseInt(appConfig.getCpuCapacity())*1.0);
return sumUsage;

View File

@ -40,4 +40,7 @@ k8sUser=testk8s
k8sPasswd=testk8s
redisAddress=106.75.96.108
redisPort=49990
redisAuth=$%^122pdl
redisAuth=$%^122pdl
#正式版资源总量
cpuCapacity=24
memCapacity=48000