diff --git a/apollo-adminservice/src/main/scripts/shutdown.sh b/apollo-adminservice/src/main/scripts/shutdown.sh index cf194305f4124535971666f87da784e4f8a5c097..6e7cbb9663c5ed153817d00aa61c409d5c2d2449 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 6ece224a059a2b427fe2f5fa2f5a69e5e289c845..885ce033cdb190ff6b3c378209d50b3a35562c87 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 0000000000000000000000000000000000000000..b52af2da48f420144e123cf53094212d6521ac60 --- /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 77724eb95fb5b720f42e88af2996774e82363bff..152f4ce08f62ee6488c3563a499c570513462caf 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 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 32a45337df022c4f36664175fb56b0cf9ae2253e..c3d49bc731654898ef5fd513fa28d5e66c294f20 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 6989494eb0d2f69bd6b05f6b2a38230cc7191347..c89445e9d82939a6d651a6d35e1fcc5c14dfaadc 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 e6f315d09ddfef03b1e3ae7ff1d7d6a59d12842f..302f621661228c2106dd802185d4023fe07aa0e8 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 -