From e04fbee8dcd24b40001a3d602e3855f6fc9a8743 Mon Sep 17 00:00:00 2001 From: ascrutae Date: Fri, 16 Dec 2016 17:00:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- skywalking-alarm/bin/sw-alarm-server.sh | 6 +- skywalking-alarm/pom.xml | 123 +----------------- .../src/main/assembly/assembly.xml | 36 +++++ .../alarm/AlarmMessageProcessThread.java | 1 - .../skywalking/alarm/UserInfoCoordinator.java | 2 - .../skywalking/alarm/dao/SystemConfigDao.java | 41 ------ .../eye/skywalking/alarm/model/AlarmRule.java | 1 - .../alarm/procesor/AlarmMessageProcessor.java | 3 - .../skywalking/alarm/util/AlarmTypeUtil.java | 19 +-- .../eye/skywalking/alarm/util/RedisUtil.java | 2 +- .../alarm/util/TemplateConfigurationUtil.java | 1 - .../skywalking-routing/bin/routingServer.sh | 27 ++++ .../skywalking-routing/pom.xml | 45 +++++-- .../src/main/assembly/assembly.xml | 36 +++++ .../com/a/eye/skywalking/routing/Main.java | 4 +- .../alarm/sender/AlarmMessageSender.java | 3 + .../eye/skywalking/routing/config/Config.java | 2 +- .../src/main/resources/config.properties | 38 ++++++ .../src/main/resources/log4j.properties | 2 +- .../skywalking-storage/bin/storageServer.sh | 6 +- .../skywalking-storage/pom.xml | 94 ++----------- .../src/main/assembly/assembly.xml | 34 +++++ .../storage/boot/ElasticBootstrap.java | 2 +- 23 files changed, 250 insertions(+), 278 deletions(-) create mode 100644 skywalking-alarm/src/main/assembly/assembly.xml delete mode 100644 skywalking-alarm/src/main/java/com/a/eye/skywalking/alarm/dao/SystemConfigDao.java create mode 100644 skywalking-storage-center/skywalking-routing/bin/routingServer.sh create mode 100644 skywalking-storage-center/skywalking-routing/src/main/assembly/assembly.xml create mode 100644 skywalking-storage-center/skywalking-routing/src/main/resources/config.properties create mode 100644 skywalking-storage-center/skywalking-storage/src/main/assembly/assembly.xml 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 - package - - copy-resources - - - ${project.build.directory}/installer/config - - - src/main/resources - false - - - - - - copy-start-script + make-zip package - copy-resources + single - ${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() { - @Override public Collection exe(Jedis client) { Map result = client.hgetAll(key); if (result != null) { diff --git a/skywalking-alarm/src/main/java/com/a/eye/skywalking/alarm/util/AlarmTypeUtil.java b/skywalking-alarm/src/main/java/com/a/eye/skywalking/alarm/util/AlarmTypeUtil.java index 16297999b..4f43017d5 100644 --- a/skywalking-alarm/src/main/java/com/a/eye/skywalking/alarm/util/AlarmTypeUtil.java +++ b/skywalking-alarm/src/main/java/com/a/eye/skywalking/alarm/util/AlarmTypeUtil.java @@ -1,33 +1,20 @@ package com.a.eye.skywalking.alarm.util; import com.a.eye.skywalking.alarm.model.AlarmType; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import java.util.ArrayList; import java.util.List; public class AlarmTypeUtil { - - private static Logger logger = LogManager.getLogger(AlarmTypeUtil.class); private static List alarmTypeList; - static { - try { - alarmTypeList = new ArrayList(); - alarmTypeList.add(new AlarmType("default", "exception", "System Exception")); - alarmTypeList.add(new AlarmType("ExecuteTime-PossibleError", "remark", "Excution Time > 5s")); - alarmTypeList.add(new AlarmType("ExecuteTime-Warning", "remark", "Excution Time > 500ms")); - } catch (Exception e) { - logger.error("Failed to load alarm type info.", e); - System.exit(-1); - } - } - public static List getAlarmTypeList() { if (alarmTypeList == null || alarmTypeList.isEmpty()) { alarmTypeList = new ArrayList(); + alarmTypeList.add(new AlarmType("default", "exception", "System Exception")); + alarmTypeList.add(new AlarmType("ExecuteTime-PossibleError", "remark", "Excution Time > 5s")); + alarmTypeList.add(new AlarmType("ExecuteTime-Warning", "remark", "Excution Time > 500ms")); } return alarmTypeList; diff --git a/skywalking-alarm/src/main/java/com/a/eye/skywalking/alarm/util/RedisUtil.java b/skywalking-alarm/src/main/java/com/a/eye/skywalking/alarm/util/RedisUtil.java index 6b695096f..5c14ecc83 100644 --- a/skywalking-alarm/src/main/java/com/a/eye/skywalking/alarm/util/RedisUtil.java +++ b/skywalking-alarm/src/main/java/com/a/eye/skywalking/alarm/util/RedisUtil.java @@ -58,6 +58,6 @@ public class RedisUtil { } public interface Executable { - public R exe(Jedis client); + R exe(Jedis client); } } diff --git a/skywalking-alarm/src/main/java/com/a/eye/skywalking/alarm/util/TemplateConfigurationUtil.java b/skywalking-alarm/src/main/java/com/a/eye/skywalking/alarm/util/TemplateConfigurationUtil.java index 0a0c9cd54..40a994af6 100644 --- a/skywalking-alarm/src/main/java/com/a/eye/skywalking/alarm/util/TemplateConfigurationUtil.java +++ b/skywalking-alarm/src/main/java/com/a/eye/skywalking/alarm/util/TemplateConfigurationUtil.java @@ -5,7 +5,6 @@ import java.io.IOException; import java.sql.SQLException; import com.a.eye.skywalking.alarm.conf.Config; -import com.a.eye.skywalking.alarm.dao.SystemConfigDao; import freemarker.template.Configuration; import freemarker.template.TemplateModelException; diff --git a/skywalking-storage-center/skywalking-routing/bin/routingServer.sh b/skywalking-storage-center/skywalking-routing/bin/routingServer.sh new file mode 100644 index 000000000..84a96fd66 --- /dev/null +++ b/skywalking-storage-center/skywalking-routing/bin/routingServer.sh @@ -0,0 +1,27 @@ +#!/bin/sh + +ROUTING_HOME=`dirname "$0"`/.. +ROUTING_CFG_DIR="${ROUTING_HOME}/config" +ROUTING_LOG_DIR="${ROUTING_HOME}/logs" + +if [ "$JAVA_HOME" != "" ]; then + JAVA="$JAVA_HOME/bin/java" +else + JAVA=java +fi + +if [ ! -d "${ROUTING_LOG_DIR}" ]; then + mkdir -p ${ROUTING_LOG_DIR} +fi + +CLASSPATH="$ROUTING_CFG_DIR:$CLASSPATH" + +for i in "${ROUTING_HOME}"/libs/*.jar +do + CLASSPATH="$i:$CLASSPATH" +done + +echo "CLASSPATH=$CLASSPATH" + + +$JAVA ${JAVA_OPTS} -classpath $CLASSPATH com.a.eye.skywalking.routing.Main >> ${ROUTING_HOME}/logs/routing-server.log 2>&1& \ No newline at end of file diff --git a/skywalking-storage-center/skywalking-routing/pom.xml b/skywalking-storage-center/skywalking-routing/pom.xml index 3c27ae590..e15bd5481 100644 --- a/skywalking-storage-center/skywalking-routing/pom.xml +++ b/skywalking-storage-center/skywalking-routing/pom.xml @@ -1,4 +1,5 @@ - skywalking-storage-center @@ -18,13 +19,6 @@ - - org.apache.curator - curator-test - 3.2.0 - test - - redis.clients jedis @@ -37,4 +31,39 @@ 2.0-2016 + + + skywalking-routing + + + org.apache.maven.plugins + maven-jar-plugin + 2.3.2 + + + *.properties + *.xml + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + make-zip + package + + single + + + + src/main/assembly/assembly.xml + + + + + + + diff --git a/skywalking-storage-center/skywalking-routing/src/main/assembly/assembly.xml b/skywalking-storage-center/skywalking-routing/src/main/assembly/assembly.xml new file mode 100644 index 000000000..3ce413a66 --- /dev/null +++ b/skywalking-storage-center/skywalking-routing/src/main/assembly/assembly.xml @@ -0,0 +1,36 @@ + + + + zip + + + + /libs + runtime + + + + + ${project.basedir}/bin + /bin + + routingServer.sh + + 0755 + + + src/main/resources + /config + + + ${project.build.directory}/${build.finalName} + /libs + + ${build.finalName}.jar + + + + diff --git a/skywalking-storage-center/skywalking-routing/src/main/java/com/a/eye/skywalking/routing/Main.java b/skywalking-storage-center/skywalking-routing/src/main/java/com/a/eye/skywalking/routing/Main.java index 2e90e30c0..55ce61642 100644 --- a/skywalking-storage-center/skywalking-routing/src/main/java/com/a/eye/skywalking/routing/Main.java +++ b/skywalking-storage-center/skywalking-routing/src/main/java/com/a/eye/skywalking/routing/Main.java @@ -47,7 +47,7 @@ public class Main { Properties properties = new Properties(); try { properties.load(Main.class.getResourceAsStream("/config.properties")); - printStorageConfig(properties); + printRoutingConfig(properties); ConfigInitializer.initialize(properties, Config.class); } catch (IllegalAccessException e) { logger.error("Initialize server configuration failure.", e); @@ -58,7 +58,7 @@ public class Main { } } - private static void printStorageConfig(Properties config) { + private static void printRoutingConfig(Properties config) { for (Map.Entry entry : config.entrySet()) { logger.info("{} = {}", entry.getKey(), entry.getValue()); } diff --git a/skywalking-storage-center/skywalking-routing/src/main/java/com/a/eye/skywalking/routing/alarm/sender/AlarmMessageSender.java b/skywalking-storage-center/skywalking-routing/src/main/java/com/a/eye/skywalking/routing/alarm/sender/AlarmMessageSender.java index bd96d03bb..81a41075c 100644 --- a/skywalking-storage-center/skywalking-routing/src/main/java/com/a/eye/skywalking/routing/alarm/sender/AlarmMessageSender.java +++ b/skywalking-storage-center/skywalking-routing/src/main/java/com/a/eye/skywalking/routing/alarm/sender/AlarmMessageSender.java @@ -3,6 +3,7 @@ package com.a.eye.skywalking.routing.alarm.sender; import com.a.eye.skywalking.logging.api.ILog; import com.a.eye.skywalking.logging.api.LogManager; import com.a.eye.skywalking.routing.config.Config; + import redis.clients.jedis.Jedis; /** @@ -16,6 +17,8 @@ public class AlarmMessageSender { Jedis jedis = null; try { jedis = AlarmRedisConnector.getJedis(); + if (jedis != null) + return; jedis.hsetnx(alarmKey, traceId, message); jedis.expire(alarmKey, Config.Alarm.ALARM_EXPIRE_SECONDS); } catch (Exception e) { diff --git a/skywalking-storage-center/skywalking-routing/src/main/java/com/a/eye/skywalking/routing/config/Config.java b/skywalking-storage-center/skywalking-routing/src/main/java/com/a/eye/skywalking/routing/config/Config.java index b83cb2cd5..770d85dc1 100644 --- a/skywalking-storage-center/skywalking-routing/src/main/java/com/a/eye/skywalking/routing/config/Config.java +++ b/skywalking-storage-center/skywalking-routing/src/main/java/com/a/eye/skywalking/routing/config/Config.java @@ -41,7 +41,7 @@ public class Config { public static String REDIS_SERVER = "127.0.0.1:6379"; - public static boolean ALARM_OFF_FLAG = false; + public static boolean ALARM_OFF_FLAG = true; public static int ALARM_EXCEPTION_STACK_LENGTH = 300; diff --git a/skywalking-storage-center/skywalking-routing/src/main/resources/config.properties b/skywalking-storage-center/skywalking-routing/src/main/resources/config.properties new file mode 100644 index 000000000..d5e0a4a97 --- /dev/null +++ b/skywalking-storage-center/skywalking-routing/src/main/resources/config.properties @@ -0,0 +1,38 @@ +# the port which routing server listening +server.port=23000 +# +#search.check_cycle=100 +# +#search.timeout=3000 +# the type of registry center (default: zookeeper) +#registrycenter.type=zookeeper +# the connect url that registry center +registrycenter.connect_url=127.0.0.1:2181 +# auth schema that registry center +#registrycenter.auth_schema= +# the auth info that registry center +#registrycenter.auth_info= +# +#registrycenter.path_prefix=/skywalking/routing_list/ +# +#storagenode.subscribe_path=/skywalking/storage_list +# +#disruptor.buffer_size=524288 +# +#disruptor.flush_size=100 +# the connect url for alarm +alarm.redis_server=127.0.0.1:6379 +# +#alarm.alarm_off_flag=true +# +#alarm.alarm_exception_stack_length=300 +# +#alarm.alarm_redis_inspector_interval=100 +# +#alarm.redis_max_idle=10 +# +#alarm.redis_min_idle=1 +# +#alarm.redis_max_total=30 +# +#alarm.alarm_expire_seconds=3600000 \ No newline at end of file diff --git a/skywalking-storage-center/skywalking-routing/src/main/resources/log4j.properties b/skywalking-storage-center/skywalking-routing/src/main/resources/log4j.properties index ff4274755..5ec4c9765 100644 --- a/skywalking-storage-center/skywalking-routing/src/main/resources/log4j.properties +++ b/skywalking-storage-center/skywalking-routing/src/main/resources/log4j.properties @@ -1,5 +1,5 @@ # logger # -log4j.rootLogger=ERROR,Rolling_File,CONSOLE +log4j.rootLogger=INFO,Rolling_File,CONSOLE log4j.logger.org.apache=OFF log4j.logger.io.netty=OFF log4j.org.elasticsearch=OFF diff --git a/skywalking-storage-center/skywalking-storage/bin/storageServer.sh b/skywalking-storage-center/skywalking-storage/bin/storageServer.sh index d58ac0b2f..e43ab6005 100644 --- a/skywalking-storage-center/skywalking-storage/bin/storageServer.sh +++ b/skywalking-storage-center/skywalking-storage/bin/storageServer.sh @@ -4,7 +4,7 @@ STORAGE_SERVER_BIN="$0" # Get standard environment variables STORAGE_SERVER_BIN_DIR=`dirname "$STORAGE_SERVER_BIN"` STORAGE_PREFIX="${STORAGE_SERVER_BIN_DIR}/.." -STORAGE_LOG_DIR="${STORAGE_SERVER_BIN_DIR}/../log" +STORAGE_LOG_DIR="${STORAGE_SERVER_BIN_DIR}/../logs" STORAGE_CFG_DIR="${STORAGE_SERVER_BIN_DIR}/../config" #echo $STORAGE_SERVER_BIN_DIR @@ -15,6 +15,10 @@ else JAVA=java fi +if [ ! -d "${STORAGE_LOG_DIR}" ]; then + mkdir -p "${STORAGE_LOG_DIR}" +fi + CLASSPATH="$STORAGE_CFG_DIR:$CLASSPATH" for i in "${STORAGE_SERVER_BIN_DIR}"/../lib/*.jar diff --git a/skywalking-storage-center/skywalking-storage/pom.xml b/skywalking-storage-center/skywalking-storage/pom.xml index 9e1fee93d..ca26d05fb 100644 --- a/skywalking-storage-center/skywalking-storage/pom.xml +++ b/skywalking-storage-center/skywalking-storage/pom.xml @@ -1,4 +1,5 @@ - 4.0.0 @@ -40,74 +41,25 @@ + skywalking-storage org.apache.maven.plugins - maven-compiler-plugin - 3.6.0 - - 1.8 - 1.8 - ${project.build.sourceEncoding} - - - - org.apache.maven.plugins - maven-resources-plugin - 2.6 + maven-assembly-plugin - copy-resources + make-zip package - copy-resources + single - ${project.build.directory}/install/config - - - src/main/resources - false - - + + src/main/assembly/assembly.xml + - - copy-start-script - package - - copy-resources - - - ${project.build.directory}/install/bin - - - bin - false - - - - - - - - maven-dependency-plugin - - - copy-dependencies - package - - copy-dependencies - - - - ${project.build.directory}/install/lib - false - true - runtime - compile - maven-jar-plugin @@ -116,7 +68,6 @@ *.properties *.xml - ${project.build.directory}/install/lib @@ -129,15 +80,11 @@ compile - - - - - - + @@ -150,22 +97,7 @@ pre-clean - - - - - run - - - - tar - package - - - - - + diff --git a/skywalking-storage-center/skywalking-storage/src/main/assembly/assembly.xml b/skywalking-storage-center/skywalking-storage/src/main/assembly/assembly.xml new file mode 100644 index 000000000..0d8579205 --- /dev/null +++ b/skywalking-storage-center/skywalking-storage/src/main/assembly/assembly.xml @@ -0,0 +1,34 @@ + + + + zip + + + + /libs + runtime + + + + + ${project.basedir}/bin + /bin + + storageServer.sh + + 0755 + + + src/main/resources + /config + + + ${project.build.directory}/${build.finalName}/data/index + /data/index + 0755 + + + diff --git a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/boot/ElasticBootstrap.java b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/boot/ElasticBootstrap.java index 66529304d..f765dfa70 100644 --- a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/boot/ElasticBootstrap.java +++ b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/boot/ElasticBootstrap.java @@ -15,7 +15,7 @@ public class ElasticBootstrap { private static ILog logger = LogManager.getLogger(ElasticBootstrap.class); public static final String DATA_INDEX_HOME = "DATA_INDEX_HOME"; private static final String DEVELOP_RUNTIME_ELASTIC_HOME = - ElasticBootstrap.class.getResource("/").getPath() + ".." + File.separator + "install" + File.separator + "data" + ElasticBootstrap.class.getResource("/").getPath() + ".." + File.separator + "skywalking-storage" + File.separator + "data" + File.separator + "index"; private String elasticHome; -- GitLab