From 36cdfda0d979792cbb3ee28f0c72c8a631e7ac63 Mon Sep 17 00:00:00 2001
From: Jason Song <nobodyiam@gmail.com>
Date: Fri, 3 Jun 2016 11:56:06 +0800
Subject: [PATCH] move back common startup logic

---
 .../src/main/scripts/common_startup.sh        | 68 -------------------
 .../src/main/scripts/startup.sh               | 68 ++++++++++++++++++-
 .../src/main/scripts/common_startup.sh        | 68 -------------------
 .../src/main/scripts/startup.sh               | 68 ++++++++++++++++++-
 .../src/main/scripts/common_startup.sh        | 68 -------------------
 apollo-portal/src/main/scripts/startup.sh     | 68 ++++++++++++++++++-
 6 files changed, 201 insertions(+), 207 deletions(-)
 delete mode 100644 apollo-adminservice/src/main/scripts/common_startup.sh
 delete mode 100644 apollo-configservice/src/main/scripts/common_startup.sh
 delete mode 100644 apollo-portal/src/main/scripts/common_startup.sh

diff --git a/apollo-adminservice/src/main/scripts/common_startup.sh b/apollo-adminservice/src/main/scripts/common_startup.sh
deleted file mode 100644
index 4d7a6c205..000000000
--- a/apollo-adminservice/src/main/scripts/common_startup.sh
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-
-if [[ -z "$JAVA_HOME" && -d /usr/java/latest/ ]]; then
-    export JAVA_HOME=/usr/java/latest/
-fi
-
-cd `dirname $0`/..
-
-for i in `ls $SERVICE_NAME-*.jar 2>/dev/null`
-do
-    if [[ ! $i == *"-sources.jar" ]]
-    then
-        PATH_TO_JAR=$i
-        break
-    fi
-done
-
-if [[ ! -f PATH_TO_JAR && -d current ]]; then
-    cd current
-    for i in `ls $SERVICE_NAME-*.jar 2>/dev/null`
-    do
-        if [[ ! $i == *"-sources.jar" ]]
-        then
-            PATH_TO_JAR=$i
-            break
-        fi
-    done
-fi
-
-if [[ -f $SERVICE_NAME".jar" ]]; then
-  rm -rf $SERVICE_NAME".jar"
-fi
-
-ln $PATH_TO_JAR $SERVICE_NAME".jar"
-chmod a+x $SERVICE_NAME".jar"
-./$SERVICE_NAME".jar" start
-
-rc=$?;
-
-if [[ $rc != 0 ]];
-then
-    echo "Failed to start $SERVICE_NAME.jar, return code: $rc"
-    exit $rc;
-fi
-
-declare -i counter=0
-declare -i max_counter=30 # 30*5=150s
-declare -i total_time=0
-
-printf "Waiting for server startup"
-until [[ (( counter -ge max_counter )) || "$(curl --silent --connect-timeout 1 --head $SERVER_URL | grep "Coyote")" != "" ]];
-do
-    printf "."
-    counter+=1
-    sleep 5
-done
-
-total_time=counter*5
-
-if [[ (( counter -ge max_counter )) ]];
-then
-    printf "\nServer failed to start in $total_time seconds!\n"
-    exit 1;
-fi
-
-printf "\nServer started in $total_time seconds!\n"
-
-exit 0;
diff --git a/apollo-adminservice/src/main/scripts/startup.sh b/apollo-adminservice/src/main/scripts/startup.sh
index 6efb8e8ab..0f56843fd 100644
--- a/apollo-adminservice/src/main/scripts/startup.sh
+++ b/apollo-adminservice/src/main/scripts/startup.sh
@@ -8,4 +8,70 @@ export JAVA_OPTS="$JAVA_OPTS -Xloggc:/opt/logs/100003172/heap_trace.txt -XX:Heap
 SERVER_PORT=8090
 SERVER_URL="http://localhost:$SERVER_PORT"
 
-source ./common_startup.sh
+########### The following is the same for configservice, adminservice, portal ###########
+if [[ -z "$JAVA_HOME" && -d /usr/java/latest/ ]]; then
+    export JAVA_HOME=/usr/java/latest/
+fi
+
+cd `dirname $0`/..
+
+for i in `ls $SERVICE_NAME-*.jar 2>/dev/null`
+do
+    if [[ ! $i == *"-sources.jar" ]]
+    then
+        PATH_TO_JAR=$i
+        break
+    fi
+done
+
+if [[ ! -f PATH_TO_JAR && -d current ]]; then
+    cd current
+    for i in `ls $SERVICE_NAME-*.jar 2>/dev/null`
+    do
+        if [[ ! $i == *"-sources.jar" ]]
+        then
+            PATH_TO_JAR=$i
+            break
+        fi
+    done
+fi
+
+if [[ -f $SERVICE_NAME".jar" ]]; then
+  rm -rf $SERVICE_NAME".jar"
+fi
+
+ln $PATH_TO_JAR $SERVICE_NAME".jar"
+chmod a+x $SERVICE_NAME".jar"
+./$SERVICE_NAME".jar" start
+
+rc=$?;
+
+if [[ $rc != 0 ]];
+then
+    echo "Failed to start $SERVICE_NAME.jar, return code: $rc"
+    exit $rc;
+fi
+
+declare -i counter=0
+declare -i max_counter=30 # 30*5=150s
+declare -i total_time=0
+
+printf "Waiting for server startup"
+until [[ (( counter -ge max_counter )) || "$(curl --silent --connect-timeout 1 --head $SERVER_URL | grep "Coyote")" != "" ]];
+do
+    printf "."
+    counter+=1
+    sleep 5
+done
+
+total_time=counter*5
+
+if [[ (( counter -ge max_counter )) ]];
+then
+    printf "\nServer failed to start in $total_time seconds!\n"
+    exit 1;
+fi
+
+printf "\nServer started in $total_time seconds!\n"
+
+exit 0;
diff --git a/apollo-configservice/src/main/scripts/common_startup.sh b/apollo-configservice/src/main/scripts/common_startup.sh
deleted file mode 100644
index 4d7a6c205..000000000
--- a/apollo-configservice/src/main/scripts/common_startup.sh
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-
-if [[ -z "$JAVA_HOME" && -d /usr/java/latest/ ]]; then
-    export JAVA_HOME=/usr/java/latest/
-fi
-
-cd `dirname $0`/..
-
-for i in `ls $SERVICE_NAME-*.jar 2>/dev/null`
-do
-    if [[ ! $i == *"-sources.jar" ]]
-    then
-        PATH_TO_JAR=$i
-        break
-    fi
-done
-
-if [[ ! -f PATH_TO_JAR && -d current ]]; then
-    cd current
-    for i in `ls $SERVICE_NAME-*.jar 2>/dev/null`
-    do
-        if [[ ! $i == *"-sources.jar" ]]
-        then
-            PATH_TO_JAR=$i
-            break
-        fi
-    done
-fi
-
-if [[ -f $SERVICE_NAME".jar" ]]; then
-  rm -rf $SERVICE_NAME".jar"
-fi
-
-ln $PATH_TO_JAR $SERVICE_NAME".jar"
-chmod a+x $SERVICE_NAME".jar"
-./$SERVICE_NAME".jar" start
-
-rc=$?;
-
-if [[ $rc != 0 ]];
-then
-    echo "Failed to start $SERVICE_NAME.jar, return code: $rc"
-    exit $rc;
-fi
-
-declare -i counter=0
-declare -i max_counter=30 # 30*5=150s
-declare -i total_time=0
-
-printf "Waiting for server startup"
-until [[ (( counter -ge max_counter )) || "$(curl --silent --connect-timeout 1 --head $SERVER_URL | grep "Coyote")" != "" ]];
-do
-    printf "."
-    counter+=1
-    sleep 5
-done
-
-total_time=counter*5
-
-if [[ (( counter -ge max_counter )) ]];
-then
-    printf "\nServer failed to start in $total_time seconds!\n"
-    exit 1;
-fi
-
-printf "\nServer started in $total_time seconds!\n"
-
-exit 0;
diff --git a/apollo-configservice/src/main/scripts/startup.sh b/apollo-configservice/src/main/scripts/startup.sh
index fc7dbf821..93e24c43f 100644
--- a/apollo-configservice/src/main/scripts/startup.sh
+++ b/apollo-configservice/src/main/scripts/startup.sh
@@ -8,4 +8,70 @@ export JAVA_OPTS="$JAVA_OPTS -Xloggc:/opt/logs/100003171/heap_trace.txt -XX:Heap
 SERVER_PORT=8080
 SERVER_URL="http://localhost:$SERVER_PORT"
 
-source ./common_startup.sh
+########### The following is the same for configservice, adminservice, portal ###########
+if [[ -z "$JAVA_HOME" && -d /usr/java/latest/ ]]; then
+    export JAVA_HOME=/usr/java/latest/
+fi
+
+cd `dirname $0`/..
+
+for i in `ls $SERVICE_NAME-*.jar 2>/dev/null`
+do
+    if [[ ! $i == *"-sources.jar" ]]
+    then
+        PATH_TO_JAR=$i
+        break
+    fi
+done
+
+if [[ ! -f PATH_TO_JAR && -d current ]]; then
+    cd current
+    for i in `ls $SERVICE_NAME-*.jar 2>/dev/null`
+    do
+        if [[ ! $i == *"-sources.jar" ]]
+        then
+            PATH_TO_JAR=$i
+            break
+        fi
+    done
+fi
+
+if [[ -f $SERVICE_NAME".jar" ]]; then
+  rm -rf $SERVICE_NAME".jar"
+fi
+
+ln $PATH_TO_JAR $SERVICE_NAME".jar"
+chmod a+x $SERVICE_NAME".jar"
+./$SERVICE_NAME".jar" start
+
+rc=$?;
+
+if [[ $rc != 0 ]];
+then
+    echo "Failed to start $SERVICE_NAME.jar, return code: $rc"
+    exit $rc;
+fi
+
+declare -i counter=0
+declare -i max_counter=30 # 30*5=150s
+declare -i total_time=0
+
+printf "Waiting for server startup"
+until [[ (( counter -ge max_counter )) || "$(curl --silent --connect-timeout 1 --head $SERVER_URL | grep "Coyote")" != "" ]];
+do
+    printf "."
+    counter+=1
+    sleep 5
+done
+
+total_time=counter*5
+
+if [[ (( counter -ge max_counter )) ]];
+then
+    printf "\nServer failed to start in $total_time seconds!\n"
+    exit 1;
+fi
+
+printf "\nServer started in $total_time seconds!\n"
+
+exit 0;
diff --git a/apollo-portal/src/main/scripts/common_startup.sh b/apollo-portal/src/main/scripts/common_startup.sh
deleted file mode 100644
index 4d7a6c205..000000000
--- a/apollo-portal/src/main/scripts/common_startup.sh
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-
-if [[ -z "$JAVA_HOME" && -d /usr/java/latest/ ]]; then
-    export JAVA_HOME=/usr/java/latest/
-fi
-
-cd `dirname $0`/..
-
-for i in `ls $SERVICE_NAME-*.jar 2>/dev/null`
-do
-    if [[ ! $i == *"-sources.jar" ]]
-    then
-        PATH_TO_JAR=$i
-        break
-    fi
-done
-
-if [[ ! -f PATH_TO_JAR && -d current ]]; then
-    cd current
-    for i in `ls $SERVICE_NAME-*.jar 2>/dev/null`
-    do
-        if [[ ! $i == *"-sources.jar" ]]
-        then
-            PATH_TO_JAR=$i
-            break
-        fi
-    done
-fi
-
-if [[ -f $SERVICE_NAME".jar" ]]; then
-  rm -rf $SERVICE_NAME".jar"
-fi
-
-ln $PATH_TO_JAR $SERVICE_NAME".jar"
-chmod a+x $SERVICE_NAME".jar"
-./$SERVICE_NAME".jar" start
-
-rc=$?;
-
-if [[ $rc != 0 ]];
-then
-    echo "Failed to start $SERVICE_NAME.jar, return code: $rc"
-    exit $rc;
-fi
-
-declare -i counter=0
-declare -i max_counter=30 # 30*5=150s
-declare -i total_time=0
-
-printf "Waiting for server startup"
-until [[ (( counter -ge max_counter )) || "$(curl --silent --connect-timeout 1 --head $SERVER_URL | grep "Coyote")" != "" ]];
-do
-    printf "."
-    counter+=1
-    sleep 5
-done
-
-total_time=counter*5
-
-if [[ (( counter -ge max_counter )) ]];
-then
-    printf "\nServer failed to start in $total_time seconds!\n"
-    exit 1;
-fi
-
-printf "\nServer started in $total_time seconds!\n"
-
-exit 0;
diff --git a/apollo-portal/src/main/scripts/startup.sh b/apollo-portal/src/main/scripts/startup.sh
index 8be69275d..b23792b4a 100644
--- a/apollo-portal/src/main/scripts/startup.sh
+++ b/apollo-portal/src/main/scripts/startup.sh
@@ -8,4 +8,70 @@ export JAVA_OPTS="$JAVA_OPTS -Xloggc:/opt/logs/100003173/heap_trace.txt -XX:Heap
 SERVER_PORT=8080
 SERVER_URL="http://localhost:$SERVER_PORT"
 
-source ./common_startup.sh
+########### The following is the same for configservice, adminservice, portal ###########
+if [[ -z "$JAVA_HOME" && -d /usr/java/latest/ ]]; then
+    export JAVA_HOME=/usr/java/latest/
+fi
+
+cd `dirname $0`/..
+
+for i in `ls $SERVICE_NAME-*.jar 2>/dev/null`
+do
+    if [[ ! $i == *"-sources.jar" ]]
+    then
+        PATH_TO_JAR=$i
+        break
+    fi
+done
+
+if [[ ! -f PATH_TO_JAR && -d current ]]; then
+    cd current
+    for i in `ls $SERVICE_NAME-*.jar 2>/dev/null`
+    do
+        if [[ ! $i == *"-sources.jar" ]]
+        then
+            PATH_TO_JAR=$i
+            break
+        fi
+    done
+fi
+
+if [[ -f $SERVICE_NAME".jar" ]]; then
+  rm -rf $SERVICE_NAME".jar"
+fi
+
+ln $PATH_TO_JAR $SERVICE_NAME".jar"
+chmod a+x $SERVICE_NAME".jar"
+./$SERVICE_NAME".jar" start
+
+rc=$?;
+
+if [[ $rc != 0 ]];
+then
+    echo "Failed to start $SERVICE_NAME.jar, return code: $rc"
+    exit $rc;
+fi
+
+declare -i counter=0
+declare -i max_counter=30 # 30*5=150s
+declare -i total_time=0
+
+printf "Waiting for server startup"
+until [[ (( counter -ge max_counter )) || "$(curl --silent --connect-timeout 1 --head $SERVER_URL | grep "Coyote")" != "" ]];
+do
+    printf "."
+    counter+=1
+    sleep 5
+done
+
+total_time=counter*5
+
+if [[ (( counter -ge max_counter )) ]];
+then
+    printf "\nServer failed to start in $total_time seconds!\n"
+    exit 1;
+fi
+
+printf "\nServer started in $total_time seconds!\n"
+
+exit 0;
-- 
GitLab