Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
spring-cloud-netflix
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
openSource
spring-cloud-netflix
Commits
fe1cadfc
Commit
fe1cadfc
authored
Jul 15, 2014
by
Spencer Gibb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added logging to eureka client auto config;
fixed running.md typo; added comment to turbine eureka instance discovery
parent
5a2edc5a
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
1 deletion
+8
-1
RUNNING.md
RUNNING.md
+1
-1
EurekaClientAutoConfiguration.java
...latform/netflix/eureka/EurekaClientAutoConfiguration.java
+6
-0
EurekaInstanceDiscovery.java
...ing/platform/netflix/turbine/EurekaInstanceDiscovery.java
+1
-0
No files found.
RUNNING.md
View file @
fe1cadfc
...
@@ -65,7 +65,7 @@
...
@@ -65,7 +65,7 @@
## Sandbox Sample Backend
## Sandbox Sample Backend
`spring-platform-sandbox-sample-backend$ java -jar target/spring-platform-sandbox-sample-backend-1.0.0.BUILD-SNAPSHOT.jar`
0
`spring-platform-sandbox-sample-backend$ java -jar target/spring-platform-sandbox-sample-backend-1.0.0.BUILD-SNAPSHOT.jar`
## Sandbox Sample Frontend
## Sandbox Sample Frontend
...
...
spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/EurekaClientAutoConfiguration.java
View file @
fe1cadfc
...
@@ -18,6 +18,8 @@ package org.springframework.platform.netflix.eureka;
...
@@ -18,6 +18,8 @@ package org.springframework.platform.netflix.eureka;
import
javax.annotation.PostConstruct
;
import
javax.annotation.PostConstruct
;
import
javax.annotation.PreDestroy
;
import
javax.annotation.PreDestroy
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnClass
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnClass
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnExpression
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnExpression
;
...
@@ -43,6 +45,8 @@ import com.netflix.discovery.EurekaClientConfig;
...
@@ -43,6 +45,8 @@ import com.netflix.discovery.EurekaClientConfig;
public
class
EurekaClientAutoConfiguration
implements
public
class
EurekaClientAutoConfiguration
implements
ApplicationListener
<
ContextRefreshedEvent
>
{
ApplicationListener
<
ContextRefreshedEvent
>
{
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
EurekaClientAutoConfiguration
.
class
);
@Autowired
@Autowired
private
EurekaClientConfigBean
clientConfig
;
private
EurekaClientConfigBean
clientConfig
;
...
@@ -51,6 +55,7 @@ public class EurekaClientAutoConfiguration implements
...
@@ -51,6 +55,7 @@ public class EurekaClientAutoConfiguration implements
@Override
@Override
public
void
onApplicationEvent
(
ContextRefreshedEvent
event
)
{
public
void
onApplicationEvent
(
ContextRefreshedEvent
event
)
{
logger
.
info
(
"Registering application {} with eureka with status UP"
,
instanceConfig
.
getAppname
());
ApplicationInfoManager
.
getInstance
().
setInstanceStatus
(
InstanceStatus
.
UP
);
ApplicationInfoManager
.
getInstance
().
setInstanceStatus
(
InstanceStatus
.
UP
);
}
}
...
@@ -61,6 +66,7 @@ public class EurekaClientAutoConfiguration implements
...
@@ -61,6 +66,7 @@ public class EurekaClientAutoConfiguration implements
@PreDestroy
@PreDestroy
public
void
close
()
{
public
void
close
()
{
logger
.
info
(
"Removing application {} from eureka"
,
instanceConfig
.
getAppname
());
DiscoveryManager
.
getInstance
().
shutdownComponent
();
DiscoveryManager
.
getInstance
().
shutdownComponent
();
}
}
...
...
spring-platform-netflix-turbine/src/main/java/io/spring/platform/netflix/turbine/EurekaInstanceDiscovery.java
View file @
fe1cadfc
...
@@ -163,6 +163,7 @@ public class EurekaInstanceDiscovery implements InstanceDiscovery {
...
@@ -163,6 +163,7 @@ public class EurekaInstanceDiscovery implements InstanceDiscovery {
*/
*/
protected
String
getClusterName
(
InstanceInfo
iInfo
)
{
protected
String
getClusterName
(
InstanceInfo
iInfo
)
{
return
iInfo
.
getASGName
();
return
iInfo
.
getASGName
();
//TODO: why did this break things? return iInfo.getAppGroupName();
}
}
/**
/**
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment