diff --git a/skywalking-alarm/bin/sw-alarm-server.sh b/skywalking-alarm/bin/sw-alarm-server.sh
index c20a115a1..d1cf33a33 100644
--- a/skywalking-alarm/bin/sw-alarm-server.sh
+++ b/skywalking-alarm/bin/sw-alarm-server.sh
@@ -26,9 +26,13 @@ done
# Get standard environment variables
SW_ALARM_ALARM_SERVER_BIN_DIR=`dirname "$SW_ALARM_ALARM_SERVER_BIN"`
SW_ALARM_ALARM_PREFIX="${SW_ALARM_ALARM_SERVER_BIN_DIR}/.."
-SW_ALARM_ALARM_LOG_DIR="${SW_ALARM_ALARM_SERVER_BIN_DIR}/../log"
+SW_ALARM_ALARM_LOG_DIR="${SW_ALARM_ALARM_SERVER_BIN_DIR}/../logs"
SW_ALARM_ALARM_CFG_DIR="${SW_ALARM_ALARM_SERVER_BIN_DIR}/../config"
+if [ ! -d "${SW_ALARM_ALARM_LOG_DIR}" ]; then
+ mkdir -p ${SW_ALARM_ALARM_LOG_DIR}
+fi
+
#echo $SW_ALARM_ALARM_SERVER_BIN_DIR
#set java home
if [ "$JAVA_HOME" != "" ]; then
diff --git a/skywalking-alarm/pom.xml b/skywalking-alarm/pom.xml
index 716f1f7ce..f593da031 100644
--- a/skywalking-alarm/pom.xml
+++ b/skywalking-alarm/pom.xml
@@ -10,10 +10,6 @@
skywalking-alarm
http://maven.apache.org
-
- UTF-8
-
-
junit
@@ -73,63 +69,26 @@
+ skywalking-alarm
org.apache.maven.plugins
- maven-resources-plugin
- 2.6
+ maven-assembly-plugin
- copy-resources
+ make-zip
package
- copy-resources
+ single
- ${project.build.directory}/installer/config
-
-
- src/main/resources
- false
-
-
-
-
-
- copy-start-script
- package
-
- copy-resources
-
-
- ${project.build.directory}/installer/bin
-
-
- bin
- false
-
-
+
+ src/main/assembly/assembly.xml
+
-
- maven-dependency-plugin
-
-
- copy-dependencies
- package
-
- copy-dependencies
-
-
-
-
- ${project.build.directory}/installer/lib
- false
- true
-
-
maven-jar-plugin
@@ -137,76 +96,8 @@
*.properties
*.xml
- ${project.build.directory}/installer/lib
-
-
-
- maven-antrun-plugin
-
-
- clean
- package
-
- run
-
-
-
-
-
-
-
-
-
-
-
- maven-compiler-plugin
-
- 1.7
- 1.7
- ${project.build.sourceEncoding}
-
-
-
- org.apache.maven.plugins
- maven-resources-plugin
- 2.4.3
-
- ${project.build.sourceEncoding}
-
-
-
-
- false
-
- bintray-wu-sheng-DataCarrier
- bintray
- http://dl.bintray.com/wu-sheng/DataCarrier
-
-
- mvnrepository
- mvnrepository
- http://mvnrepository.com
-
- true
-
-
- true
-
-
-
- jbossrepository
- jboss repository
- http://repository.jboss.com
-
- true
-
-
- true
-
-
-
diff --git a/skywalking-alarm/src/main/assembly/assembly.xml b/skywalking-alarm/src/main/assembly/assembly.xml
new file mode 100644
index 000000000..bd212b5c4
--- /dev/null
+++ b/skywalking-alarm/src/main/assembly/assembly.xml
@@ -0,0 +1,36 @@
+
+
+
+ zip
+
+
+
+ /libs
+ runtime
+
+
+
+
+ ${project.basedir}/bin
+ /bin
+
+ sw-alarm-server.sh
+
+ 0755
+
+
+ src/main/resources
+ /config
+
+
+ ${project.build.directory}/${build.finalName}
+ /libs
+
+ ${build.finalName}.jar
+
+
+
+
diff --git a/skywalking-alarm/src/main/java/com/a/eye/skywalking/alarm/AlarmMessageProcessThread.java b/skywalking-alarm/src/main/java/com/a/eye/skywalking/alarm/AlarmMessageProcessThread.java
index 8761d9835..0e1a47173 100644
--- a/skywalking-alarm/src/main/java/com/a/eye/skywalking/alarm/AlarmMessageProcessThread.java
+++ b/skywalking-alarm/src/main/java/com/a/eye/skywalking/alarm/AlarmMessageProcessThread.java
@@ -147,7 +147,6 @@ public class AlarmMessageProcessThread extends Thread {
private class CoordinatorStatusWatcher implements CuratorWatcher {
- @Override
public void process(WatchedEvent watchedEvent) throws Exception {
if (watchedEvent.getType() == Watcher.Event.EventType.NodeDataChanged) {
String value = ZKUtil.getPathData(Config.ZKPath.REGISTER_SERVER_PATH + "/" + threadId);
diff --git a/skywalking-alarm/src/main/java/com/a/eye/skywalking/alarm/UserInfoCoordinator.java b/skywalking-alarm/src/main/java/com/a/eye/skywalking/alarm/UserInfoCoordinator.java
index 03dd491d9..5b9e876e3 100644
--- a/skywalking-alarm/src/main/java/com/a/eye/skywalking/alarm/UserInfoCoordinator.java
+++ b/skywalking-alarm/src/main/java/com/a/eye/skywalking/alarm/UserInfoCoordinator.java
@@ -223,8 +223,6 @@ public class UserInfoCoordinator extends Thread {
}
public class RegisterServerWatcher implements CuratorWatcher {
-
- @Override
public void process(WatchedEvent watchedEvent) {
if (watchedEvent.getType() == Watcher.Event.EventType.NodeChildrenChanged) {
redistributing = true;
diff --git a/skywalking-alarm/src/main/java/com/a/eye/skywalking/alarm/dao/SystemConfigDao.java b/skywalking-alarm/src/main/java/com/a/eye/skywalking/alarm/dao/SystemConfigDao.java
deleted file mode 100644
index dfbc4b493..000000000
--- a/skywalking-alarm/src/main/java/com/a/eye/skywalking/alarm/dao/SystemConfigDao.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.a.eye.skywalking.alarm.dao;
-
-import com.a.eye.skywalking.alarm.util.DBConnectUtil;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-public class SystemConfigDao {
- private static Logger logger = LogManager.getLogger(AlarmMessageDao.class);
-
- public static String getSystemConfig(String configId) throws SQLException {
-
- String result = "";
- Connection connection = DBConnectUtil.getConnection();
-
- try {
- PreparedStatement ps = connection.prepareStatement(
- "SELECT system_config.conf_value FROM system_config WHERE system_config.sts = " +
- "? AND system_config.config_id = ?");
- ps.setString(1, "A");
- ps.setString(2, configId);
-
- ResultSet resultSet = ps.executeQuery();
- resultSet.next();
-
- result = resultSet.getString("conf_value");
- } catch (Exception e) {
- logger.error("Failed to find systemConfig.");
- throw e;
- } finally {
- if(connection != null) {
- connection.close();
- }
- }
- return result;
- }
-}
diff --git a/skywalking-alarm/src/main/java/com/a/eye/skywalking/alarm/model/AlarmRule.java b/skywalking-alarm/src/main/java/com/a/eye/skywalking/alarm/model/AlarmRule.java
index 96b83cd6f..baa3fab63 100644
--- a/skywalking-alarm/src/main/java/com/a/eye/skywalking/alarm/model/AlarmRule.java
+++ b/skywalking-alarm/src/main/java/com/a/eye/skywalking/alarm/model/AlarmRule.java
@@ -81,7 +81,6 @@ public class AlarmRule {
private static long getPreviousFireTime(final String userId, final String ruleId) {
return RedisUtil.execute(new RedisUtil.Executable() {
- @Override
public Long exe(Jedis client) {
String previousTime = client.get(userId + "-" + ruleId);
if (previousTime == null || previousTime.length() <= 0) {
diff --git a/skywalking-alarm/src/main/java/com/a/eye/skywalking/alarm/procesor/AlarmMessageProcessor.java b/skywalking-alarm/src/main/java/com/a/eye/skywalking/alarm/procesor/AlarmMessageProcessor.java
index cd83690c3..24c94f424 100644
--- a/skywalking-alarm/src/main/java/com/a/eye/skywalking/alarm/procesor/AlarmMessageProcessor.java
+++ b/skywalking-alarm/src/main/java/com/a/eye/skywalking/alarm/procesor/AlarmMessageProcessor.java
@@ -156,7 +156,6 @@ public class AlarmMessageProcessor {
private void expiredAlarmMessage(final String key) {
RedisUtil.execute(new RedisUtil.Executable() {
- @Override
public Long exe(Jedis client) {
return client.expire(key, 0);
}
@@ -166,7 +165,6 @@ public class AlarmMessageProcessor {
private void savePreviousFireTime(final String userId, final String ruleId,
final long currentFireMinuteTime) {
RedisUtil.execute(new RedisUtil.Executable() {
- @Override
public Long exe(Jedis client) {
return client.hset(userId, ruleId,
String.valueOf(currentFireMinuteTime));
@@ -177,7 +175,6 @@ public class AlarmMessageProcessor {
private void setAlarmMessages(final String key,
final Collection warningTracingIds) {
RedisUtil.execute(new RedisUtil.Executable