Authored by simba

update

@@ -141,9 +141,9 @@ public class RedisMonitorHandleServiceImpl implements IRedisMonitorHandleService @@ -141,9 +141,9 @@ public class RedisMonitorHandleServiceImpl implements IRedisMonitorHandleService
141 redisMonitor.setParamMonitor(paramMonitor.toString()); 141 redisMonitor.setParamMonitor(paramMonitor.toString());
142 } 142 }
143 }else{ 143 }else{
144 - twemproxyAlarmList.add(obj.getMoHostIp()+":"+Integer.valueOf(ports[0]+",")); 144 + twemproxyAlarmList.add(obj.getMoHostIp()+":"+obj.getMoTags()+",");
145 redisMonitor.setIsFailed(0); 145 redisMonitor.setIsFailed(0);
146 - redisMonitor.setParamMonitor(obj.getMoHostIp()+":"+Integer.valueOf(ports[0])); 146 + redisMonitor.setParamMonitor(obj.getMoHostIp()+":"+obj.getMoTags());
147 } 147 }
148 redisMonitor.setNodeFrom(redisTweproxyMap.get(obj.getMoTypeId())); 148 redisMonitor.setNodeFrom(redisTweproxyMap.get(obj.getMoTypeId()));
149 redisMonitor.setNodeTo(obj.getMoHostIp()+":"+ports[1]); 149 redisMonitor.setNodeTo(obj.getMoHostIp()+":"+ports[1]);
@@ -237,6 +237,7 @@ public class RedisMonitorHandleServiceImpl implements IRedisMonitorHandleService @@ -237,6 +237,7 @@ public class RedisMonitorHandleServiceImpl implements IRedisMonitorHandleService
237 for(String str:twemproxyAlarmList){ 237 for(String str:twemproxyAlarmList){
238 alrarmMsg.append(str); 238 alrarmMsg.append(str);
239 } 239 }
  240 + alrarmMsg.append("失败;");
240 } 241 }
241 242
242 if(!CollectionUtils.isEmpty(redisAlarmList)){ 243 if(!CollectionUtils.isEmpty(redisAlarmList)){
@@ -244,6 +245,7 @@ public class RedisMonitorHandleServiceImpl implements IRedisMonitorHandleService @@ -244,6 +245,7 @@ public class RedisMonitorHandleServiceImpl implements IRedisMonitorHandleService
244 for(String str:redisAlarmList){ 245 for(String str:redisAlarmList){
245 alrarmMsg.append(str); 246 alrarmMsg.append(str);
246 } 247 }
  248 + alrarmMsg.append("失败;");
247 } 249 }
248 250
249 if(!CollectionUtils.isEmpty(slaveAlarmList)){ 251 if(!CollectionUtils.isEmpty(slaveAlarmList)){
@@ -251,10 +253,12 @@ public class RedisMonitorHandleServiceImpl implements IRedisMonitorHandleService @@ -251,10 +253,12 @@ public class RedisMonitorHandleServiceImpl implements IRedisMonitorHandleService
251 for(String str:slaveAlarmList){ 253 for(String str:slaveAlarmList){
252 alrarmMsg.append(str); 254 alrarmMsg.append(str);
253 } 255 }
  256 + alrarmMsg.append("失败;");
254 } 257 }
255 258
256 log.info("sms redis start info {}",alrarmMsg.toString()); 259 log.info("sms redis start info {}",alrarmMsg.toString());
257 if(StringUtils.isNotBlank(alrarmMsg.toString())) { 260 if(StringUtils.isNotBlank(alrarmMsg.toString())) {
  261 + alrarmMsg.append("请您及时查看!");
258 alarmMsgService.sendSms("redis", alrarmMsg.toString(), snsMobileConfig.getBaseMobile()); 262 alarmMsgService.sendSms("redis", alrarmMsg.toString(), snsMobileConfig.getBaseMobile());
259 } 263 }
260 } 264 }