From 2c47121be9eb2ec01e587d69aa59f6337e77f9f1 Mon Sep 17 00:00:00 2001
From: Yiming Liu <liuyiming.vip@gmail.com>
Date: Wed, 27 Apr 2016 17:39:23 +0800
Subject: [PATCH] Update jenkins deploy script

---
 .../src/main/scripts/shutdown.sh              |  1 +
 .../src/main/scripts/startup.sh               |  1 +
 .../src/main/scripts/deploy_jenkins.sh        | 49 +++++++++++++++++++
 .../GlobalDefaultExceptionHandler.java        |  3 ++
 .../src/main/scripts/startup.sh               |  2 +-
 apollo-portal/src/main/scripts/shutdown.sh    |  1 +
 apollo-portal/src/main/scripts/startup.sh     |  2 +-
 7 files changed, 57 insertions(+), 2 deletions(-)
 create mode 100644 apollo-buildtools/src/main/scripts/deploy_jenkins.sh

diff --git a/apollo-adminservice/src/main/scripts/shutdown.sh b/apollo-adminservice/src/main/scripts/shutdown.sh
index cf194305f..6e7cbb966 100644
--- a/apollo-adminservice/src/main/scripts/shutdown.sh
+++ b/apollo-adminservice/src/main/scripts/shutdown.sh
@@ -3,4 +3,5 @@ SERVICE_NAME=apollo-adminservice
 PATH_TO_JAR=$SERVICE_NAME"-0.0.1-SNAPSHOT.jar"
 LOG_PATH=/opt/logs/100003172/
 
+cd `dirname $0`/..
 source bin/common.sh stop
\ No newline at end of file
diff --git a/apollo-adminservice/src/main/scripts/startup.sh b/apollo-adminservice/src/main/scripts/startup.sh
index 6ece224a0..885ce033c 100644
--- a/apollo-adminservice/src/main/scripts/startup.sh
+++ b/apollo-adminservice/src/main/scripts/startup.sh
@@ -3,5 +3,6 @@ SERVICE_NAME=apollo-adminservice
 PATH_TO_JAR=$SERVICE_NAME"-0.0.1-SNAPSHOT.jar"
 LOG_PATH=/opt/logs/100003172/
 
+cd `dirname $0`/..
 source bin/common.sh start
 
diff --git a/apollo-buildtools/src/main/scripts/deploy_jenkins.sh b/apollo-buildtools/src/main/scripts/deploy_jenkins.sh
new file mode 100644
index 000000000..b52af2da4
--- /dev/null
+++ b/apollo-buildtools/src/main/scripts/deploy_jenkins.sh
@@ -0,0 +1,49 @@
+#!/bin/bash
+set -e
+set -u
+
+cd `dirname $0`
+
+if [ $# -lt 1 ];then
+	echo "usage: `basename $0` 100003171|100003172|100003173"
+	exit 1
+fi
+
+valid_app=false
+for supported_app in 100003171 100003172 100003173 ;do
+	if [ $1 == $supported_app ];then
+		valid_app=true
+		break;
+	fi
+done
+if [ $valid_app == false ];then	
+	echo "$1 is not a supported app id"
+	exit 1
+else
+	echo "Upgrading $1"
+fi
+
+APP_BASE_DIR=/opt/ctrip/app
+APP_NAME=$1
+APP_DIR=$APP_BASE_DIR/$APP_NAME
+APP_RELEASE_DIR=$APP_BASE_DIR/apollo-$APP_NAME.releases/`date "+%Y-%m-%d.%H.%M.%S"`
+APP_STARTUP_SCRIPT=$APP_DIR/bin/startup.sh
+APP_SHUTDOWN_SCRIPTS=$APP_DIR/bin/shutdown.sh
+
+if [ -e $APP_STARTUP_SCRIPT ];then
+	$APP_SHUTDOWN_SCRIPTS
+fi
+
+mkdir -p $APP_RELEASE_DIR
+unzip *.zip -d $APP_RELEASE_DIR
+
+if [ -d $APP_DIR ];then 
+	rm -rf $APP_DIR
+fi
+ln -s $APP_RELEASE_DIR $APP_DIR
+
+chmod +x $APP_STARTUP_SCRIPT
+chmod +x $APP_SHUTDOWN_SCRIPT
+$APP_SHUTDOWN_SCRIPT 
+$APP_STARTUP_SCRIPT
+wait
\ No newline at end of file
diff --git a/apollo-common/src/main/java/com/ctrip/apollo/common/controller/GlobalDefaultExceptionHandler.java b/apollo-common/src/main/java/com/ctrip/apollo/common/controller/GlobalDefaultExceptionHandler.java
index 77724eb95..152f4ce08 100644
--- a/apollo-common/src/main/java/com/ctrip/apollo/common/controller/GlobalDefaultExceptionHandler.java
+++ b/apollo-common/src/main/java/com/ctrip/apollo/common/controller/GlobalDefaultExceptionHandler.java
@@ -12,6 +12,7 @@ import org.springframework.web.client.HttpStatusCodeException;
 import com.ctrip.apollo.core.exception.AbstractBaseException;
 import com.ctrip.apollo.core.exception.BadRequestException;
 import com.ctrip.apollo.core.exception.NotFoundException;
+import com.dianping.cat.Cat;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 
@@ -53,6 +54,8 @@ public class GlobalDefaultExceptionHandler {
       return restTemplateException(request, (HttpStatusCodeException) ex.getCause());
     }
 
+    Cat.logError(ex);
+    
     Map<String, Object> errorAttributes = new LinkedHashMap<>();
     errorAttributes.put("status", status.value());
     errorAttributes.put("message", message);
diff --git a/apollo-configservice/src/main/scripts/startup.sh b/apollo-configservice/src/main/scripts/startup.sh
index 32a45337d..c3d49bc73 100644
--- a/apollo-configservice/src/main/scripts/startup.sh
+++ b/apollo-configservice/src/main/scripts/startup.sh
@@ -3,5 +3,5 @@ SERVICE_NAME=apollo-configservice
 PATH_TO_JAR=$SERVICE_NAME"-0.0.1-SNAPSHOT.jar"
 LOG_PATH=/opt/logs/100003171/
 
+cd `dirname $0`/..
 source bin/common.sh start
-
diff --git a/apollo-portal/src/main/scripts/shutdown.sh b/apollo-portal/src/main/scripts/shutdown.sh
index 6989494eb..c89445e9d 100644
--- a/apollo-portal/src/main/scripts/shutdown.sh
+++ b/apollo-portal/src/main/scripts/shutdown.sh
@@ -3,4 +3,5 @@ SERVICE_NAME=apollo-portal
 PATH_TO_JAR=$SERVICE_NAME"-0.0.1-SNAPSHOT.jar"
 LOG_PATH=/opt/logs/100003173/
 
+cd `dirname $0`/..
 source bin/common.sh stop
\ No newline at end of file
diff --git a/apollo-portal/src/main/scripts/startup.sh b/apollo-portal/src/main/scripts/startup.sh
index e6f315d09..302f62166 100644
--- a/apollo-portal/src/main/scripts/startup.sh
+++ b/apollo-portal/src/main/scripts/startup.sh
@@ -3,5 +3,5 @@ SERVICE_NAME=apollo-portal
 PATH_TO_JAR=$SERVICE_NAME"-0.0.1-SNAPSHOT.jar"
 LOG_PATH=/opt/logs/100003173/
 
+cd `dirname $0`/..
 source bin/common.sh start
-
-- 
GitLab