update at 2021-01-21 11:27:13 by ehlxr

did-server/build.sh

@@ -1,28 +0,0 @@
-#!/bin/sh
-
-echo "############## start ##############"
-BUILD_DATE=`date +%Y-%m-%d:%H:%M:%S`
-
-SERVER_NAME=`awk '/<name>[^<]+<\/name>/{gsub(/<name>|<\/name>/,"",$1);print $1;exit;}' pom.xml`
-#SERVER_NAME=$(basename `pwd`)
-mvn clean install -DskipTests
-cp target/${SERVER_NAME}*.jar ./docker
-cd docker
-
-err=$?
-echo "############## $err ##############"
-if [ "$err" -ne "0" ]; then
-    echo "############## build error !  ##############"
-	exit 1
-fi
-
-docker_url=ehlxr/${SERVER_NAME}:latest
-
-docker build --build-arg SERVER_NAME=${SERVER_NAME} -f ./Dockerfile -t ${docker_url} .
-
-docker push ${docker_url}
-
-rm ${SERVER_NAME}*.jar
-
-echo "build & push finish ..."
-echo "##############  ${BUILD_DATE}  ##############"

did-server/docker/Dockerfile

@@ -1,16 +0,0 @@
-FROM openjdk:8-jre-alpine
-MAINTAINER ehlxr <ehlxr.me@gmail.com>
-
-WORKDIR /opt
-
-ARG SERVER_NAME
-ENV SERVER_NAME=${SERVER_NAME}
-
-COPY start.sh /opt/start.sh
-COPY ${SERVER_NAME}*.jar /opt/
-
-RUN chmod -R 755 /opt/
-
-
-EXPOSE 16830 16831
-ENTRYPOINT ["/opt/start.sh"]

did-server/docker/start.sh

@@ -1,19 +0,0 @@
-#!/bin/sh
-
-#HOSTNAME=`hostname | cut -c1-18`
-LOGS_DIR="/data/logs"
-
-if [ ! -d ${LOGS_DIR} ]; then
-	mkdir -p ${LOGS_DIR}
-fi
-STDOUT_FILE=${LOGS_DIR}/${SERVER_NAME}.log
-
-JAVA_OPTS=" -Duser.timezone=\"Asia/Shanghai\" -Djava.awt.headless=true -Djava.net.preferIPv4Stack=true -Dfile.encoding=UTF8"
-
-JAVA_MEM_OPTS=" -server -Xmx${XMX:-512m} -Xms${XMS:-128m} -Xss256k -XX:+DisableExplicitGC -XX:+UseConcMarkSweepGC \
-    -XX:+CMSParallelRemarkEnabled -XX:+UseCMSCompactAtFullCollection -XX:LargePageSizeInBytes=${LargePageSize:-4m} \
-    -XX:+UseFastAccessorMethods -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=70 "
-
-echo "Starting the ${SERVER_NAME} ...\c"
-#java -jar ${JAVA_OPTS} ${JAVA_MEM_OPTS} ./${SERVER_NAME}-*.jar > ${STDOUT_FILE} 2>&1
-java -jar ${JAVA_OPTS} ${JAVA_MEM_OPTS} ./${SERVER_NAME}-*.jar | tee -a ${STDOUT_FILE} 2>&1

did-server/src/main/resources/logback.xml

@@ -7,8 +7,8 @@
         </encoder>
     </appender>
 
-    <appender name="ID-SERVER-ERR" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>/data/logs/did/did-server-error.log</file>
+    <appender name="ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${LOG_PATH:.}/logs/did/did-server-error.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <fileNamePattern>/data/logs/did/did-server-error.log.%d{yyyy-MM-dd}</fileNamePattern>
             <maxHistory>30</maxHistory>
@@ -24,8 +24,8 @@
         </encoder>
     </appender>
 
-    <appender name="ID-SERVER" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>/data/logs/did/did-server.log</file>
+    <appender name="NORMAL" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>./logs/did/did-server.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <fileNamePattern>/data/logs/did/did-server.log.%d{yyyy-MM-dd}</fileNamePattern>
             <maxHistory>30</maxHistory>
@@ -36,11 +36,10 @@
         </encoder>
     </appender>
 
-
     <root level="INFO">
         <appender-ref ref="STDOUT"/>
-        <appender-ref ref="ID-SERVER"/>
-        <appender-ref ref="ID-SERVER-ERR"/>
+        <appender-ref ref="ERROR"/>
+        <appender-ref ref="NORMAL"/>
     </root>
 
 </configuration>