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
4995844f
Unverified
Commit
4995844f
authored
Oct 21, 2017
by
Spencer Gibb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Upgrade to eureka 1.8.4
fixes gh-2386
parent
67f887d8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
35 additions
and
4 deletions
+35
-4
pom.xml
spring-cloud-netflix-dependencies/pom.xml
+1
-1
EurekaClientConfigBean.java
...ramework/cloud/netflix/eureka/EurekaClientConfigBean.java
+34
-3
No files found.
spring-cloud-netflix-dependencies/pom.xml
View file @
4995844f
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
<description>
Spring Cloud Netflix Dependencies
</description>
<description>
Spring Cloud Netflix Dependencies
</description>
<properties>
<properties>
<archaius.version>
0.7.5
</archaius.version>
<archaius.version>
0.7.5
</archaius.version>
<eureka.version>
1.8.
2
</eureka.version>
<eureka.version>
1.8.
4
</eureka.version>
<feign.version>
9.5.1
</feign.version>
<feign.version>
9.5.1
</feign.version>
<hystrix.version>
1.5.12
</hystrix.version>
<hystrix.version>
1.5.12
</hystrix.version>
<ribbon.version>
2.2.2
</ribbon.version>
<ribbon.version>
2.2.2
</ribbon.version>
...
...
spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientConfigBean.java
View file @
4995844f
...
@@ -387,7 +387,12 @@ public class EurekaClientConfigBean implements EurekaClientConfig {
...
@@ -387,7 +387,12 @@ public class EurekaClientConfigBean implements EurekaClientConfig {
* Indicates whether the client should explicitly unregister itself from the remote server
* Indicates whether the client should explicitly unregister itself from the remote server
* on client shutdown.
* on client shutdown.
*/
*/
private
boolean
unregisterOnShutdown
=
true
;
private
boolean
shouldUnregisterOnShutdown
=
true
;
/**
* Indicates whether the client should enforce registration during initialization. Defaults to false.
*/
private
boolean
shouldEnforceRegistrationAtInit
=
false
;
@Override
@Override
public
boolean
shouldGZipContent
()
{
public
boolean
shouldGZipContent
()
{
...
@@ -421,7 +426,12 @@ public class EurekaClientConfigBean implements EurekaClientConfig {
...
@@ -421,7 +426,12 @@ public class EurekaClientConfigBean implements EurekaClientConfig {
@Override
@Override
public
boolean
shouldUnregisterOnShutdown
()
{
public
boolean
shouldUnregisterOnShutdown
()
{
return
this
.
unregisterOnShutdown
;
return
this
.
shouldUnregisterOnShutdown
;
}
@Override
public
boolean
shouldEnforceRegistrationAtInit
()
{
return
this
.
shouldEnforceRegistrationAtInit
;
}
}
@Override
@Override
...
@@ -887,6 +897,22 @@ public class EurekaClientConfigBean implements EurekaClientConfig {
...
@@ -887,6 +897,22 @@ public class EurekaClientConfigBean implements EurekaClientConfig {
this
.
clientDataAccept
=
clientDataAccept
;
this
.
clientDataAccept
=
clientDataAccept
;
}
}
public
boolean
isShouldUnregisterOnShutdown
()
{
return
shouldUnregisterOnShutdown
;
}
public
void
setShouldUnregisterOnShutdown
(
boolean
shouldUnregisterOnShutdown
)
{
this
.
shouldUnregisterOnShutdown
=
shouldUnregisterOnShutdown
;
}
public
boolean
isShouldEnforceRegistrationAtInit
()
{
return
shouldEnforceRegistrationAtInit
;
}
public
void
setShouldEnforceRegistrationAtInit
(
boolean
shouldEnforceRegistrationAtInit
)
{
this
.
shouldEnforceRegistrationAtInit
=
shouldEnforceRegistrationAtInit
;
}
@Override
@Override
public
boolean
equals
(
Object
o
)
{
public
boolean
equals
(
Object
o
)
{
if
(
this
==
o
)
return
true
;
if
(
this
==
o
)
return
true
;
...
@@ -918,6 +944,8 @@ public class EurekaClientConfigBean implements EurekaClientConfig {
...
@@ -918,6 +944,8 @@ public class EurekaClientConfigBean implements EurekaClientConfig {
fetchRegistry
==
that
.
fetchRegistry
&&
fetchRegistry
==
that
.
fetchRegistry
&&
allowRedirects
==
that
.
allowRedirects
&&
allowRedirects
==
that
.
allowRedirects
&&
onDemandUpdateStatusChange
==
that
.
onDemandUpdateStatusChange
&&
onDemandUpdateStatusChange
==
that
.
onDemandUpdateStatusChange
&&
shouldUnregisterOnShutdown
==
that
.
shouldUnregisterOnShutdown
&&
shouldEnforceRegistrationAtInit
==
that
.
shouldEnforceRegistrationAtInit
&&
Objects
.
equals
(
proxyPort
,
that
.
proxyPort
)
&&
Objects
.
equals
(
proxyPort
,
that
.
proxyPort
)
&&
Objects
.
equals
(
proxyHost
,
that
.
proxyHost
)
&&
Objects
.
equals
(
proxyHost
,
that
.
proxyHost
)
&&
Objects
.
equals
(
proxyUserName
,
that
.
proxyUserName
)
&&
Objects
.
equals
(
proxyUserName
,
that
.
proxyUserName
)
&&
...
@@ -956,7 +984,8 @@ public class EurekaClientConfigBean implements EurekaClientConfig {
...
@@ -956,7 +984,8 @@ public class EurekaClientConfigBean implements EurekaClientConfig {
logDeltaDiff
,
disableDelta
,
fetchRemoteRegionsRegistry
,
availabilityZones
,
logDeltaDiff
,
disableDelta
,
fetchRemoteRegionsRegistry
,
availabilityZones
,
filterOnlyUpInstances
,
fetchRegistry
,
dollarReplacement
,
filterOnlyUpInstances
,
fetchRegistry
,
dollarReplacement
,
escapeCharReplacement
,
allowRedirects
,
onDemandUpdateStatusChange
,
escapeCharReplacement
,
allowRedirects
,
onDemandUpdateStatusChange
,
encoderName
,
decoderName
,
clientDataAccept
);
encoderName
,
decoderName
,
clientDataAccept
,
shouldUnregisterOnShutdown
,
shouldEnforceRegistrationAtInit
);
}
}
@Override
@Override
...
@@ -1006,6 +1035,8 @@ public class EurekaClientConfigBean implements EurekaClientConfig {
...
@@ -1006,6 +1035,8 @@ public class EurekaClientConfigBean implements EurekaClientConfig {
.
append
(
"encoderName='"
).
append
(
encoderName
).
append
(
"', "
)
.
append
(
"encoderName='"
).
append
(
encoderName
).
append
(
"', "
)
.
append
(
"decoderName='"
).
append
(
decoderName
).
append
(
"', "
)
.
append
(
"decoderName='"
).
append
(
decoderName
).
append
(
"', "
)
.
append
(
"clientDataAccept='"
).
append
(
clientDataAccept
).
append
(
"'"
).
append
(
"}"
)
.
append
(
"clientDataAccept='"
).
append
(
clientDataAccept
).
append
(
"'"
).
append
(
"}"
)
.
append
(
"=shouldUnregisterOnShutdown'"
).
append
(
shouldUnregisterOnShutdown
).
append
(
"'"
).
append
(
"}"
)
.
append
(
"shouldEnforceRegistrationAtInit='"
).
append
(
shouldEnforceRegistrationAtInit
).
append
(
"'"
).
append
(
"}"
)
.
toString
();
.
toString
();
}
}
...
...
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