Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
spring-boot-admin
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-boot-admin
Commits
82b7d1f1
Commit
82b7d1f1
authored
Feb 16, 2018
by
Johannes Edmeier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Configure AdminServerDiscoveryAutoConfiguration after Eureka
fixes #647
parent
1770b4c0
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
AdminServerDiscoveryAutoConfiguration.java
.../server/config/AdminServerDiscoveryAutoConfiguration.java
+4
-3
No files found.
spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/config/AdminServerDiscoveryAutoConfiguration.java
View file @
82b7d1f1
/*
* Copyright 2014-201
7
the original author or authors.
* Copyright 2014-201
8
the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
...
...
@@ -29,7 +29,6 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnSingleCandidate
;
import
org.springframework.boot.context.properties.ConfigurationProperties
;
import
org.springframework.cloud.client.discovery.DiscoveryClient
;
import
org.springframework.cloud.client.discovery.simple.SimpleDiscoveryClientAutoConfiguration
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
com.netflix.discovery.EurekaClient
;
...
...
@@ -38,7 +37,9 @@ import com.netflix.discovery.EurekaClient;
@ConditionalOnSingleCandidate
(
DiscoveryClient
.
class
)
@ConditionalOnBean
(
AdminServerMarkerConfiguration
.
Marker
.
class
)
@ConditionalOnProperty
(
prefix
=
"spring.boot.admin.discovery"
,
name
=
"enabled"
,
matchIfMissing
=
true
)
@AutoConfigureAfter
({
AdminServerAutoConfiguration
.
class
,
SimpleDiscoveryClientAutoConfiguration
.
class
})
@AutoConfigureAfter
(
value
=
AdminServerAutoConfiguration
.
class
,
name
=
{
"org.springframework.cloud.netflix.eureka.EurekaClientAutoConfiguration"
,
"org.springframework.cloud.client.discovery.simple.SimpleDiscoveryClientAutoConfiguration"
})
public
class
AdminServerDiscoveryAutoConfiguration
{
@Bean
...
...
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