Authored by jack

Merge branch 'dev_memcache'

@@ -46,10 +46,10 @@ public class MemcachedMonitorImpl { @@ -46,10 +46,10 @@ public class MemcachedMonitorImpl {
46 @Autowired 46 @Autowired
47 private IMObjectInfoService mobjectService; 47 private IMObjectInfoService mobjectService;
48 48
49 - @Getter 49 + @Autowired
50 private AlarmMsgService alarmMsgService; 50 private AlarmMsgService alarmMsgService;
51 51
52 - @Getter 52 + @Autowired
53 private SnsMobileConfig snsMobileConfig; 53 private SnsMobileConfig snsMobileConfig;
54 54
55 55
@@ -90,16 +90,16 @@ public class MemcachedMonitorImpl { @@ -90,16 +90,16 @@ public class MemcachedMonitorImpl {
90 client.shutdown(); 90 client.shutdown();
91 } catch (IOException e) { 91 } catch (IOException e) {
92 LOGGER.error("MemcachedMonitorImpl.doMonitor:creatr/shutdown memcached client occurs Exception: ", e.getMessage()); 92 LOGGER.error("MemcachedMonitorImpl.doMonitor:creatr/shutdown memcached client occurs Exception: ", e.getMessage());
93 - this.getAlarmMsgService().sendSms("Memcached", "Can not connect to Memcached " + monitorUrl.toString() + " .", this.getSnsMobileConfig().getBaseMobile()); 93 + alarmMsgService.sendSms("Memcached", "Can not connect to Memcached " + monitorUrl.toString() + " .", snsMobileConfig.getBaseMobile());
94 } catch (MemcachedException e) { 94 } catch (MemcachedException e) {
95 LOGGER.error("MemcachedMonitorImpl.doMonitor:get memcached status occurs Exception: ", e.getMessage()); 95 LOGGER.error("MemcachedMonitorImpl.doMonitor:get memcached status occurs Exception: ", e.getMessage());
96 - this.getAlarmMsgService().sendSms("Memcached", "Can not get Memcached status" + monitorUrl.toString() + " .", this.getSnsMobileConfig().getBaseMobile()); 96 + alarmMsgService.sendSms("Memcached", "Can not get Memcached status" + monitorUrl.toString() + " .", snsMobileConfig.getBaseMobile());
97 } catch (InterruptedException e) { 97 } catch (InterruptedException e) {
98 LOGGER.error("MemcachedMonitorImpl.doMonitor:get memcached status occurs Exception: ", e.getMessage()); 98 LOGGER.error("MemcachedMonitorImpl.doMonitor:get memcached status occurs Exception: ", e.getMessage());
99 - this.getAlarmMsgService().sendSms("Memcached", "Can not get Memcached status" + monitorUrl.toString() + " .", this.getSnsMobileConfig().getBaseMobile()); 99 + alarmMsgService.sendSms("Memcached", "Can not get Memcached status" + monitorUrl.toString() + " .", snsMobileConfig.getBaseMobile());
100 } catch (TimeoutException e) { 100 } catch (TimeoutException e) {
101 LOGGER.error("MemcachedMonitorImpl.doMonitor:get memcached status occurs Exception: ", e.getMessage()); 101 LOGGER.error("MemcachedMonitorImpl.doMonitor:get memcached status occurs Exception: ", e.getMessage());
102 - this.getAlarmMsgService().sendSms("Memcached", "Can not get Memcached status" + monitorUrl.toString() + " .", this.getSnsMobileConfig().getBaseMobile()); 102 + alarmMsgService.sendSms("Memcached", "Can not get Memcached status" + monitorUrl.toString() + " .", snsMobileConfig.getBaseMobile());
103 } 103 }
104 //校验是否所有memcached都返回状态,对未返回状态的memcached短信告警 104 //校验是否所有memcached都返回状态,对未返回状态的memcached短信告警
105 checkAllStatus(monitorUrl.toString().trim(), result); 105 checkAllStatus(monitorUrl.toString().trim(), result);
@@ -178,7 +178,7 @@ public class MemcachedMonitorImpl { @@ -178,7 +178,7 @@ public class MemcachedMonitorImpl {
178 for (InetSocketAddress address: monitorUrlSet) { 178 for (InetSocketAddress address: monitorUrlSet) {
179 failUrl.append(address.toString()+" "); 179 failUrl.append(address.toString()+" ");
180 } 180 }
181 - this.getAlarmMsgService().sendSms("Memcached", "Failed to get Memcached status" + failUrl.toString() + " .", this.getSnsMobileConfig().getBaseMobile()); 181 + alarmMsgService.sendSms("Memcached", "Failed to get Memcached status" + failUrl.toString() + " .", snsMobileConfig.getBaseMobile());
182 182
183 } 183 }
184 } 184 }