diff --git a/skywalking-server/bin/swserver.sh b/skywalking-server/bin/swserver.sh new file mode 100644 index 000000000..2c140e7b4 --- /dev/null +++ b/skywalking-server/bin/swserver.sh @@ -0,0 +1,49 @@ +#!/bin/sh + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false +os400=false +darwin=false +case "`uname`" in +CYGWIN*) cygwin=true;; +OS400*) os400=true;; +Darwin*) darwin=true;; +esac + +# resolve links - $0 may be a softlink +SW_SERVER_BIN="$0" + +while [ -h "$SW_SERVER_BIN" ]; do + ls=`ls -ld "$SW_SERVER_BIN"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + SW_SERVER_BIN="$link" + else + SW_SERVER_BIN=`dirname "$SW_SERVER_BIN"`/"$link" + fi +done + +# Get standard environment variables +SW_SERVER_BIN_DIR=`dirname "$SW_SERVER_BIN"` +SW_PREFIX="${SW_SERVER_BIN_DIR}/.." +SW_LOG_DIR="${SW_SERVER_BIN_DIR}/../log" +SW_CFG_DIR="${SW_SERVER_BIN_DIR}/../config" + +#echo $SW_SERVER_BIN_DIR +#set java home +if [ "$JAVA_HOME" != "" ]; then + JAVA="$JAVA_HOME/bin/java" +else + JAVA=java +fi + +CLASSPATH="$SW_CFG_DIR:$CLASSPATH" + +for i in "${SW_SERVER_BIN_DIR}"/../lib/*.jar +do + CLASSPATH="$i:$CLASSPATH" +done + +echo "CLASSPATH=$CLASSPATH" + +$JAVA -classpath $CLASSPATH com.ai.cloud.skywalking.reciever.CollectionServer >> ${SW_SERVER_BIN_DIR}/../log/sw-server.log & 2>&1& diff --git a/skywalking-server/installer/config/config.properties b/skywalking-server/installer/config/config.properties deleted file mode 100644 index c21ff8088..000000000 --- a/skywalking-server/installer/config/config.properties +++ /dev/null @@ -1,35 +0,0 @@ -#采集服务器的端口 -server.port=34000 - -#最大数据缓存线程数量 -buffer.max_thread_number=1 -#每个线程最大缓存数量 -buffer.per_thread_max_buffer_number=1024 -#无数据处理时轮询等待时间(单位:毫秒) -buffer.max_wait_time=5000 -#数据冲突时等待时间(单位:毫秒) -buffer.data_conflict_wait_time=10 -#数据缓存文件目录 -buffer.data_buffer_file_parent_directory=D:/test-data/data/buffer -#缓存数据文件最大长度(单位:byte) -buffer.data_file_max_length=10240 -#每次Flush的缓存数据的个数 -buffer.flush_number_of_cache=30 - -#最大持久化的线程数量 -persistence.max_thread_number=1 -#定位文件时,每次读取偏移量跳过大小 -persistence.offset_file_skip_length=2048 -#每次读取文件偏移量大小 -persistence.offset_file_read_buffer_size=2048 -#处理文件完成之后,等待时间(单位:毫秒) -persistence.switch_file_wait_time=5000 - -#偏移量注册文件的目录 -registerpersistence.register_file_parent_directory=D:/test-data/data/offset -#偏移量注册文件名 -registerpersistence.register_file_name=offset.txt -#偏移量注册备份文件名 -registerpersistence.register_bak_file_name=offset.txt.bak -#偏移量写入文件等待周期(单位:毫秒) -registerpersistence.offset_written_file_wait_cycle=5000 \ No newline at end of file diff --git a/skywalking-server/installer/config/log4j2.xml b/skywalking-server/installer/config/log4j2.xml deleted file mode 100644 index 025d5b2fb..000000000 --- a/skywalking-server/installer/config/log4j2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/skywalking-server/pom.xml b/skywalking-server/pom.xml index a40294c88..ed4b5549c 100644 --- a/skywalking-server/pom.xml +++ b/skywalking-server/pom.xml @@ -41,12 +41,28 @@ copy-resources - pre-integration-test + install copy-resources - ${project.basedir}/installer/config + ${project.build.directory}/installer/config + + + src/main/resources + false + + + + + + copy-start-script + install + + copy-resources + + + ${project.build.directory}/installer/bin src/main/resources @@ -69,11 +85,42 @@ - ${project.basedir}/installer/lib + ${project.build.directory}/installer/lib false true + + maven-jar-plugin + + + *.properties + *.xml + + sky-walking-server + ${project.build.directory}/installer/lib + + + + maven-antrun-plugin + + + clean + package + + run + + + + + + + + + + + +