update

yu1ming · Sep 24, 2013 · 5579ae3 · 5579ae3
1 parent 69c8cce
commit 5579ae3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/taokeeper-common/pom.xml b/taokeeper-common/pom.xml
@@ -68,7 +68,6 @@
  <groupId>junit</groupId>
  <artifactId>junit</artifactId>
  </dependency>
-
  </dependencies>
 
 </project>
diff --git a/...ain/java/com/taobao/taokeeper/monitor/core/task/runable/ZKServerPerformanceCollector.java b/...ain/java/com/taobao/taokeeper/monitor/core/task/runable/ZKServerPerformanceCollector.java
@@ -95,8 +95,9 @@ public void sendAlarm( AlarmSettings alarmSettings, HostPerformanceEntity hostPe
  new Message( wangwangList, "ZK Server cpu usage too high-" + clusterName, hostPerformanceEntity.getIp() + " cpu usage too high! " + cpuUsage + "-" + maxCpuUsage + "=" + difference,
  Message.MessageType.WANGWANG ),
  new Message( phoneList, "ZK Server cpu usage too high-" + clusterName, "ZK Server cpu usage too high-" + clusterName + hostPerformanceEntity.getIp() + " cpu usage too high! " + cpuUsage + "-"
- + maxCpuUsage + "=" + difference, Message.MessageType.WANGWANG )
+ + maxCpuUsage + "=" + difference, Message.MessageType.SMS )
  ) );
+ LOG.info( "WangWangList: " + wangwangList );
  }
  }
  }
@@ -119,6 +120,7 @@ public void sendAlarm( AlarmSettings alarmSettings, HostPerformanceEntity hostPe
  new Message( phoneList, "", "ZK Server memory usage too high-" + clusterName + hostPerformanceEntity.getIp() + memoryUsage + "-" + maxMemoryUsage + "=" + difference, Message.MessageType.SMS )
 
  ) );
+ LOG.info( "WangWangList: " + wangwangList );
  }
  }
  }
@@ -142,7 +144,7 @@ public void sendAlarm( AlarmSettings alarmSettings, HostPerformanceEntity hostPe
  + maxLoad + "=" + difference, Message.MessageType.SMS )
 
  ) );
-
+ LOG.info( "WangWangList: " + wangwangList );
  }
  }
  }
@@ -184,6 +186,7 @@ public void sendAlarm( AlarmSettings alarmSettings, HostPerformanceEntity hostPe
  + hostPerformanceEntity.getIp() + "," + mountedOn + ": " + diskUsage
  + "%, max setting usage is: " + maxDiskUsage + "%", Message.MessageType.SMS )
  ) );
+ LOG.info( "WangWangList: " + wangwangList );
  }
  }
  }

diff --git a/taokeeper-reporter/src/main/java/com/taobao/taokeeper/reporter/alarm/TbMessageSender.java b/taokeeper-reporter/src/main/java/com/taobao/taokeeper/reporter/alarm/TbMessageSender.java
@@ -95,6 +95,7 @@ private boolean sendMessage( String targetAddresses, String subject, String cont
  url = StringUtil.replacePlaceholder( SystemConstant.URL_TEMPLEMENT_OF_MESSAG_SEND, map );
  }
  }
+ LOG.info( "[Taokeeper]Send message: " + url );
  return "ok".equalsIgnoreCase( NetUtil.getContentOfUrl( url ) );
 
  }