Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
superrain51
apollo
提交
f01b76f4
apollo
项目概览
superrain51
/
apollo
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
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,发现更多精彩内容 >>
提交
f01b76f4
编写于
4月 14, 2016
作者:
L
lepdou
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #85 from yiming187/actuator_update
Update pom to support actuator
上级
44375b3b
13241ea0
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
102 addition
and
48 deletion
+102
-48
apollo-adminservice/src/main/java/com/ctrip/apollo/adminservice/AdminServiceHealthIndicator.java
...trip/apollo/adminservice/AdminServiceHealthIndicator.java
+32
-0
apollo-biz/pom.xml
apollo-biz/pom.xml
+4
-0
apollo-biz/src/main/java/com/ctrip/apollo/biz/service/AdminService.java
.../main/java/com/ctrip/apollo/biz/service/AdminService.java
+6
-1
apollo-configservice/src/main/java/com/ctrip/apollo/configservice/ConfigServiceHealthIndicator.java
...ip/apollo/configservice/ConfigServiceHealthIndicator.java
+32
-0
apollo-portal/pom.xml
apollo-portal/pom.xml
+28
-47
未找到文件。
apollo-adminservice/src/main/java/com/ctrip/apollo/adminservice/AdminServiceHealthIndicator.java
0 → 100644
浏览文件 @
f01b76f4
package
com.ctrip.apollo.adminservice
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.actuate.health.Health
;
import
org.springframework.boot.actuate.health.HealthIndicator
;
import
org.springframework.data.domain.PageRequest
;
import
org.springframework.stereotype.Component
;
import
com.ctrip.apollo.biz.service.AppService
;
@Component
public
class
AdminServiceHealthIndicator
implements
HealthIndicator
{
@Autowired
private
AppService
appService
;
@Override
public
Health
health
()
{
int
errorCode
=
check
();
if
(
errorCode
!=
0
)
{
return
Health
.
down
().
withDetail
(
"Error Code"
,
errorCode
).
build
();
}
return
Health
.
up
().
build
();
}
private
int
check
()
{
PageRequest
pageable
=
new
PageRequest
(
0
,
1
);
appService
.
findAll
(
pageable
);
return
0
;
}
}
apollo-biz/pom.xml
浏览文件 @
f01b76f4
...
...
@@ -16,6 +16,10 @@
<groupId>
com.ctrip.apollo
</groupId>
<artifactId>
apollo-core
</artifactId>
</dependency>
<dependency>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-starter-actuator
</artifactId>
</dependency>
<dependency>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-starter-data-jpa
</artifactId>
...
...
apollo-biz/src/main/java/com/ctrip/apollo/biz/service/AdminService.java
浏览文件 @
f01b76f4
package
com.ctrip.apollo.biz.service
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.actuate.metrics.CounterService
;
import
org.springframework.stereotype.Service
;
import
com.ctrip.apollo.biz.entity.App
;
...
...
@@ -27,8 +28,12 @@ public class AdminService {
@Autowired
private
ClusterRepository
clusterRepository
;
@Autowired
private
CounterService
counter
;
public
App
createNewApp
(
String
appId
,
String
appName
,
String
ownerName
,
String
ownerEmail
,
String
namespace
)
{
counter
.
increment
(
"admin.createNewApp.start"
);
App
app
=
new
App
();
app
.
setAppId
(
appId
);
app
.
setName
(
appName
);
...
...
@@ -51,7 +56,7 @@ public class AdminService {
ns
.
setClusterName
(
cluster
.
getName
());
ns
.
setNamespaceName
(
namespace
);
namespaceRepository
.
save
(
ns
);
counter
.
increment
(
"admin.createNewApp.success"
);
return
app
;
}
}
apollo-configservice/src/main/java/com/ctrip/apollo/configservice/ConfigServiceHealthIndicator.java
0 → 100644
浏览文件 @
f01b76f4
package
com.ctrip.apollo.configservice
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.actuate.health.Health
;
import
org.springframework.boot.actuate.health.HealthIndicator
;
import
org.springframework.data.domain.PageRequest
;
import
org.springframework.stereotype.Component
;
import
com.ctrip.apollo.biz.service.AppService
;
@Component
public
class
ConfigServiceHealthIndicator
implements
HealthIndicator
{
@Autowired
private
AppService
appService
;
@Override
public
Health
health
()
{
int
errorCode
=
check
();
if
(
errorCode
!=
0
)
{
return
Health
.
down
().
withDetail
(
"Error Code"
,
errorCode
).
build
();
}
return
Health
.
up
().
build
();
}
private
int
check
()
{
PageRequest
pageable
=
new
PageRequest
(
0
,
1
);
appService
.
findAll
(
pageable
);
return
0
;
}
}
apollo-portal/pom.xml
浏览文件 @
f01b76f4
<?xml version="1.0" encoding="UTF-8"?>
<project
xmlns=
"http://maven.apache.org/POM/4.0.0"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
>
<parent>
<groupId>
com.ctrip.apollo
</groupId>
<artifactId>
apollo
</artifactId>
<version>
0.0.1-SNAPSHOT
</version>
<relativePath>
../pom.xml
</relativePath>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<artifactId>
apollo-portal
</artifactId>
<name>
Apollo Portal
</name>
<dependencies>
<dependency>
<groupId>
com.ctrip.apollo
</groupId>
<artifactId>
apollo-core
</artifactId>
</dependency>
<dependency>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-starter-eureka
</artifactId>
</dependency>
<dependency>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-devtools
</artifactId>
<optional>
true
</optional>
</dependency>
<dependency>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-starter-data-jpa
</artifactId>
</dependency>
<dependency>
<groupId>
com.h2database
</groupId>
<artifactId>
h2
</artifactId>
</dependency>
<dependency>
<groupId>
mysql
</groupId>
<artifactId>
mysql-connector-java
</artifactId>
<scope>
runtime
</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-maven-plugin
</artifactId>
</plugin>
</plugins>
</build>
xsi:schemaLocation=
"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
>
<parent>
<groupId>
com.ctrip.apollo
</groupId>
<artifactId>
apollo
</artifactId>
<version>
0.0.1-SNAPSHOT
</version>
<relativePath>
../pom.xml
</relativePath>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<artifactId>
apollo-portal
</artifactId>
<name>
Apollo Portal
</name>
<dependencies>
<dependency>
<groupId>
com.ctrip.apollo
</groupId>
<artifactId>
apollo-core
</artifactId>
</dependency>
<dependency>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-starter-web
</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-maven-plugin
</artifactId>
</plugin>
</plugins>
</build>
</project>
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录