add traceconfigfile

bin/dos2unix

@@ -0,0 +1,16 @@
+#!/bin/sh
+if [ "$1" = "-h" ] || [ "$1" = "" ]; then
+	printf "\n\tUsage : `basename $0` {files}\n"
+	printf "\n\t- Convert text file from DOS format to ISO format\n\n"
+else
+	for i in $*; do
+		if [ -f $i ]; then
+			tr -d "\r" < $i > /tmp/cr2lf.$$
+			cat /tmp/cr2lf.$$ > $i              # retains permissions.
+			rm /tmp/cr2lf.$$
+		else
+			echo $0": " $i "does not exist." >&2
+		fi
+	done
+fi
+

bin/info.sh

@@ -0,0 +1,28 @@
+#!/bin/sh
+
+INFO_API_URI="http://192.168.10.99"
+#INFO_API_URI="http://192.168.10.20"
+INFO_API_TIMEOUT=3
+HEADER_CONTEXT_TYPE="Content-Type: application/json"
+
+usage() {
+	echo "Usage:" $0 "[server/client]"
+	exit
+}
+
+case $1 in
+  server)
+    PORT=9871;
+    ;;
+  client)
+    PORT=9872;
+    ;;
+  *)
+    PORT=;
+    ;;
+esac
+
+INFO_API_URI=${INFO_API_URI}:${PORT}/info
+
+curl -H $HEADER_CONTEXT_TYPE $INFO_API_URI --connect-timeout $INFO_API_TIMEOUT
+

bin/rota-utic-client.yml

@@ -0,0 +1,9 @@
+spring:
+  profiles:
+    active: dev
+server:
+  port: 9872
+
+  application:
+    process-id: rota-utic-client
+

bin/rota-utic-server.yml

@@ -0,0 +1,10 @@
+spring:
+  profiles:
+    active: dev
+server:
+  port: 9871
+
+  application:
+    process-id: rota-utic-server
+
+

bin/start.sh

@@ -0,0 +1,57 @@
+#!/bin/sh
+
+APP_HOME=/home/asnuser/bin
+LOG_HOME=/home/asnuser/logs
+
+APP_NAME="rota-utic-"
+SERVER_APP="rota-utic-server"
+CLIENT_APP="rota-utic-client"
+SERVER_JAR="$APP_HOME/$SERVER_APP-0.0.1.jar"
+CLIENT_JAR="$APP_HOME/$CLIENT_APP-0.0.1.jar"
+SERVER_PID="$APP_HOME/conf/$SERVER_APP.pid"
+CLIENT_PID="$APP_HOME/conf/$CLIENT_APP.pid"
+
+start_program() {
+    JAR_FILE=$1
+    PID_FILE=$2
+    PROGRAM_NAME=$3
+
+    if [ -f $PID_FILE ]; then
+        PID=$(cat $PID_FILE)
+        if ps -p $PID > /dev/null 2>&1; then
+            echo "    >> $PROGRAM_NAME is already running."
+            exit 1
+        else
+            rm $PID_FILE
+        fi
+    fi
+
+    JAVA_OPT="-server"
+    #JAVA_OPT="$JAVA_OPT -Xlog:gc*:file=${LOG_HOME}/${PROGRAM_NAME}/${PROGRAM_NAME}.gc.log"
+    $HOME/bin/java8/bin/java $JAVA_OPT -jar $JAR_FILE &
+    echo $! > $PID_FILE
+    echo "    >> $PROGRAM_NAME started with PID $(cat $PID_FILE)"
+}
+
+case $1 in
+  server)
+    start_program $SERVER_JAR $SERVER_PID $SERVER_APP
+    ;;
+  client)
+    start_program $CLIENT_JAR $CLIENT_PID $CLIENT_APP
+    ;;
+  all)
+    start_program $CLIENT_JAR $CLIENT_PID $CLIENT_APP
+    start_program $SERVER_JAR $SERVER_PID $SERVER_APP
+    ;;
+  *)
+    echo "Usage: $0 {server|client|all}"
+    exit 1
+    ;;
+esac
+
+sleep 1
+
+ps -eaf | grep java | grep jar | grep $APP_NAME | grep -v grep | grep -v tail | grep -v kafka | grep -v vi | wc -l
+sleep 1
+ps -eaf | grep java | grep jar | grep $APP_NAME | grep -v grep | grep -v tail | grep -v kafka | grep -v vi

bin/startall.sh

@@ -0,0 +1,19 @@
+#!/bin/sh
+
+#SERVICE_HOME=$(dirname $0)
+USER_HOME=/home/asnuser
+SERVICE_HOME=/home/asnuser/bin
+
+${SERVICE_HOME}/stopall.sh
+sleep 1
+
+${SERVICE_HOME}/start.sh server
+sleep 1
+
+${SERVICE_HOME}/start.sh client
+sleep 1
+
+${SERVICE_HOME}/stat.sh
+
+
+

bin/stat.sh

@@ -0,0 +1,44 @@
+#!/bin/sh
+
+APP_HOME=/home/asnuser/bin
+
+APP_NAME="rota-utic-"
+SERVER_APP="rota-utic-server"
+CLIENT_APP="rota-utic-client"
+SERVER_PID="$APP_HOME/conf/$SERVER_APP.pid"
+CLIENT_PID="$APP_HOME/conf/$CLIENT_APP.pid"
+
+check_status() {
+    PID_FILE=$1
+    PROGRAM_NAME=$2
+
+    if [ -f $PID_FILE ]; then
+        PID=$(cat $PID_FILE)
+        if ps -p $PID > /dev/null 2>&1; then
+            echo "    >> $PROGRAM_NAME is running with PID $PID"
+        else
+            echo "    >> $PROGRAM_NAME is not running, but PID file exists"
+        fi
+    else
+        echo "    >> $PROGRAM_NAME is not running"
+    fi
+}
+
+case $1 in
+  server)
+    check_status $SERVER_PID $SERVER_APP
+    ;;
+  client)
+    check_status $CLIENT_PID $CLIENT_APP
+    ;;
+  *)
+    check_status $SERVER_PID $SERVER_APP
+    check_status $CLIENT_PID $CLIENT_APP
+    ;;
+esac
+
+sleep 1
+
+ps -eaf | grep java | grep jar | grep $APP_NAME | grep -v grep | grep -v tail | grep -v kafka | grep -v vi | wc -l
+sleep 1
+ps -eaf | grep java | grep jar | grep $APP_NAME | grep -v grep | grep -v tail | grep -v kafka | grep -v vi

bin/stop.sh

@@ -0,0 +1,73 @@
+#!/bin/sh
+
+APP_HOME=/home/asnuser/bin
+LOG_HOME=/home/asnuser/logs
+
+APP_NAME="rota-utic-"
+SERVER_APP="rota-utic-server"
+CLIENT_APP="rota-utic-client"
+SERVER_PID="$APP_HOME/conf/$SERVER_APP.pid"
+CLIENT_PID="$APP_HOME/conf/$CLIENT_APP.pid"
+
+stop_program() {
+    PID_FILE=$1
+    PROGRAM_NAME=$2
+
+    if [ ! -z $PID_FILE ]; then
+        if [ -f $PID_FILE ]; then
+            PID=$(cat $PID_FILE)
+            if ps -p $PID > /dev/null 2>&1; then
+                kill -15 $PID
+                echo "    >> $PROGRAM_NAME, Killed process $PID"
+
+                #LOOP=$(seq 0 12)
+                #for i in $LOOP
+				for i in {0..12}
+                do
+                  sleep 1
+                  if [ -f "$PID_FILE" ]; then
+                    echo "    >> $PROGRAM_NAME stopping.........."
+                  else
+                    echo "    >> $PROGRAM_NAME stopped.........."
+                    exit
+                  fi
+                done
+
+                if [ -f "$PID_FILE" ]; then
+                    kill -9 $PID
+                    sleep 1
+                    rm $PID_FILE
+                fi
+            else
+                echo "No process found with PID $(cat $PID_FILE)"
+                rm $PID_FILE
+            fi
+        else
+            echo "    >> $PROGRAM_NAME is not running...."
+            ps -eaf | grep $PROGRAM_NAME | grep -v grep |grep -v tail | wc -l
+            ps -eaf | grep $PROGRAM_NAME | grep -v grep |grep -v tail
+            #exit
+        fi
+    fi
+}
+
+case $1 in
+  server)
+    stop_program $SERVER_PID $SERVER_APP
+    ;;
+  client)
+    stop_program $CLIENT_PID $CLIENT_APP
+    ;;
+  all)
+    ;;
+  *)
+    echo "Usage: $0 {server|client|all}"
+    exit 1
+    ;;
+esac
+
+sleep 1
+
+ps -eaf | grep java | grep jar | grep $APP_NAME | grep -v grep | grep -v tail | grep -v kafka | grep -v vi | wc -l
+sleep 1
+ps -eaf | grep java | grep jar | grep $APP_NAME | grep -v grep | grep -v tail | grep -v kafka | grep -v vi

bin/stopall.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+#SERVICE_HOME=$(dirname $0)
+USER_HOME=/home/asnuser
+SERVICE_HOME=/home/asnuser/bin
+
+${SERVICE_HOME}/stop.sh server
+sleep 1
+
+${SERVICE_HOME}/stop.sh client
+sleep 1
+
+${SERVICE_HOME}/stat.sh

conf/rota-utic-client.yml

@@ -1,3 +1,8 @@
 spring:
   profiles:
     active: dev
+server:
+  port: 9872
+
+application:
+  process-id: rota-utic-client

conf/rota-utic-server.yml

@@ -1,4 +1,9 @@
 spring:
   profiles:
     active: dev
+server:
+  port: 9871
+
+application:
+  process-id: rota-utic-server
 

rota-utic-client/conf/rota-utic-client.yml

@@ -1,3 +1,8 @@
 spring:
   profiles:
     active: dev
+server:
+  port: 9872
+
+application:
+  process-id: rota-utic-client

rota-utic-client/src/main/java/com/its/rota/utic/client/RotaUticClientApplication.java

@@ -35,7 +35,7 @@ import java.util.Date;
 @ComponentScan(basePackages = {"com.its.common.spring", "com.its.rota.utic.client.config", "com.its.rota.utic.client"})
 public class RotaUticClientApplication implements CommandLineRunner, ApplicationListener<ContextClosedEvent>, InitializingBean, DisposableBean {
 
-    private static final String APPLICATION_NAME = "rota-utic-client";
+    public static final String APPLICATION_NAME = "rota-utic-client";
 
     public static void main(String[] args) {
         SpringApplication application = new SpringApplicationBuilder()

rota-utic-client/src/main/java/com/its/rota/utic/client/config/TraceConfig.java

@@ -1,6 +1,7 @@
 package com.its.rota.utic.client.config;
 
 import com.its.common.utils.StringUtils;
+import com.its.rota.utic.client.RotaUticClientApplication;
 import com.its.rota.utic.client.dto.CenterDto;
 import com.its.rota.utic.client.repository.ApplicationRepository;
 import lombok.Getter;
@@ -10,6 +11,7 @@ import lombok.ToString;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
+import java.io.File;
 import java.io.FileInputStream;
 import java.util.List;
 import java.util.Properties;
@@ -25,10 +27,10 @@ public class TraceConfig {
     private final ApplicationRepository repo;
 
     private Properties getProperties() {
-        String workingDir = System.getProperty("user.dir");
+        String traceFileName = System.getProperty("user.dir") + File.separator + "conf" + File.separator + RotaUticClientApplication.APPLICATION_NAME + "-trace.cfg";
         Properties props = new Properties();
         try {
-            FileInputStream in = new FileInputStream(workingDir + "/conf/evps-comm-server-trace.cfg");
+            FileInputStream in = new FileInputStream(traceFileName);
             props.load(in);
             in.close();
         }

rota-utic-server/conf/rota-utic-server.yml

@@ -1,4 +1,8 @@
 spring:
   profiles:
     active: dev
+server:
+  port: 9871
 
+application:
+  process-id: rota-utic-server

rota-utic-server/src/main/java/com/its/rota/utic/server/RotaUticServerApplication.java

@@ -35,7 +35,7 @@ import java.util.Date;
 @ComponentScan(basePackages = {"com.its.common.spring", "com.its.rota.utic.server.config", "com.its.rota.utic.server"})
 public class RotaUticServerApplication implements CommandLineRunner, ApplicationListener<ContextClosedEvent>, InitializingBean, DisposableBean {
 
-    private static final String APPLICATION_NAME = "rota-utic-server";
+    public static final String APPLICATION_NAME = "rota-utic-server";
 
     public static void main(String[] args) {
         SpringApplication application = new SpringApplicationBuilder()

rota-utic-server/src/main/java/com/its/rota/utic/server/config/TraceConfig.java

@@ -1,6 +1,7 @@
 package com.its.rota.utic.server.config;
 
 import com.its.common.utils.StringUtils;
+import com.its.rota.utic.server.RotaUticServerApplication;
 import com.its.rota.utic.server.dto.CenterDto;
 import com.its.rota.utic.server.repository.ApplicationRepository;
 import lombok.Getter;
@@ -10,6 +11,7 @@ import lombok.ToString;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
+import java.io.File;
 import java.io.FileInputStream;
 import java.util.List;
 import java.util.Properties;
@@ -25,10 +27,10 @@ public class TraceConfig {
     private final ApplicationRepository repo;
 
     private Properties getProperties() {
-        String workingDir = System.getProperty("user.dir");
+        String traceFileName = System.getProperty("user.dir") + File.separator + "conf" + File.separator + RotaUticServerApplication.APPLICATION_NAME + "-trace.cfg";
         Properties props = new Properties();
         try {
-            FileInputStream in = new FileInputStream(workingDir + "/conf/evps-comm-server-trace.cfg");
+            FileInputStream in = new FileInputStream(traceFileName);
             props.load(in);
             in.close();
         }