Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wrr-cat
apollo
提交
f5898737
apollo
项目概览
wrr-cat
/
apollo
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
apollo
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
f5898737
编写于
4月 27, 2016
作者:
J
Jason Song
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #151 from yiming187/jenkins_update
Update jenkins deploy script
上级
bd4220e9
2c47121b
变更
7
显示空白变更内容
内联
并排
Showing
7 changed file
with
57 addition
and
2 deletion
+57
-2
apollo-adminservice/src/main/scripts/shutdown.sh
apollo-adminservice/src/main/scripts/shutdown.sh
+1
-0
apollo-adminservice/src/main/scripts/startup.sh
apollo-adminservice/src/main/scripts/startup.sh
+1
-0
apollo-buildtools/src/main/scripts/deploy_jenkins.sh
apollo-buildtools/src/main/scripts/deploy_jenkins.sh
+49
-0
apollo-common/src/main/java/com/ctrip/apollo/common/controller/GlobalDefaultExceptionHandler.java
...ollo/common/controller/GlobalDefaultExceptionHandler.java
+3
-0
apollo-configservice/src/main/scripts/startup.sh
apollo-configservice/src/main/scripts/startup.sh
+1
-1
apollo-portal/src/main/scripts/shutdown.sh
apollo-portal/src/main/scripts/shutdown.sh
+1
-0
apollo-portal/src/main/scripts/startup.sh
apollo-portal/src/main/scripts/startup.sh
+1
-1
未找到文件。
apollo-adminservice/src/main/scripts/shutdown.sh
浏览文件 @
f5898737
...
...
@@ -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
apollo-adminservice/src/main/scripts/startup.sh
浏览文件 @
f5898737
...
...
@@ -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
apollo-buildtools/src/main/scripts/deploy_jenkins.sh
0 → 100644
浏览文件 @
f5898737
#!/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
apollo-common/src/main/java/com/ctrip/apollo/common/controller/GlobalDefaultExceptionHandler.java
浏览文件 @
f5898737
...
...
@@ -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
);
...
...
apollo-configservice/src/main/scripts/startup.sh
浏览文件 @
f5898737
...
...
@@ -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
apollo-portal/src/main/scripts/shutdown.sh
浏览文件 @
f5898737
...
...
@@ -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
apollo-portal/src/main/scripts/startup.sh
浏览文件 @
f5898737
...
...
@@ -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
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录