这是indexloc提供的服务，不要输入任何密码
Skip to content
This repository was archived by the owner on Mar 4, 2021. It is now read-only.

Replace the deprecated Eureka's DiscoveryManager #244

Merged
merged 3 commits into from
Mar 7, 2016
Merged

Replace the deprecated Eureka's DiscoveryManager #244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d86d9ce
use EurekaModule and DI as recommended in Eureka 1.4.1
ervansetiawan Mar 5, 2016
d37e469
use EurekaModule and DI as recommended in Eureka 1.4.1
ervansetiawan Mar 5, 2016
3f452ea
use EurekaModule and DI as recommended in Eureka 1.4.1
ervansetiawan Mar 5, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/main/java/com/netflix/simianarmy/basic/conformity/BasicConformityMonkeyContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@
import com.amazonaws.services.simpleemail.AmazonSimpleEmailServiceClient;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.inject.Guice;
import com.google.inject.Injector;
import com.netflix.discovery.DiscoveryClient;
import com.netflix.discovery.DiscoveryManager;
import com.netflix.discovery.guice.EurekaModule;
import com.netflix.simianarmy.aws.conformity.SimpleDBConformityClusterTracker;
import com.netflix.simianarmy.aws.conformity.crawler.AWSClusterCrawler;
import com.netflix.simianarmy.aws.conformity.rule.BasicConformityEurekaClient;
Expand All @@ -45,7 +47,6 @@
import com.netflix.simianarmy.conformity.ConformityMonkey;
import com.netflix.simianarmy.conformity.ConformityRule;
import com.netflix.simianarmy.conformity.ConformityRuleEngine;

import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -107,7 +108,8 @@ public BasicConformityMonkeyContext() {

if (eurekaEnabled) {
LOGGER.info("Initializing Discovery client.");
DiscoveryClient discoveryClient = DiscoveryManager.getInstance().getDiscoveryClient();
Injector injector = Guice.createInjector(new EurekaModule());
DiscoveryClient discoveryClient = injector.getInstance(DiscoveryClient.class);
ConformityEurekaClient conformityEurekaClient = new BasicConformityEurekaClient(discoveryClient);
if (configuration().getBoolOrElse(
"simianarmy.conformity.rule.InstanceIsHealthyInEureka.enabled", false)) {
Expand Down
10 changes: 7 additions & 3 deletions src/main/java/com/netflix/simianarmy/basic/janitor/BasicJanitorMonkeyContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@
import com.amazonaws.regions.Region;
import com.amazonaws.regions.Regions;
import com.amazonaws.services.simpleemail.AmazonSimpleEmailServiceClient;
import com.netflix.discovery.DiscoveryManager;
import com.google.inject.Guice;
import com.google.inject.Injector;
import com.netflix.discovery.DiscoveryClient;
import com.netflix.discovery.guice.EurekaModule;
import com.netflix.simianarmy.MonkeyCalendar;
import com.netflix.simianarmy.MonkeyConfiguration;
import com.netflix.simianarmy.MonkeyRecorder;
Expand Down Expand Up @@ -63,7 +66,6 @@
import com.netflix.simianarmy.janitor.JanitorMonkey;
import com.netflix.simianarmy.janitor.JanitorResourceTracker;
import com.netflix.simianarmy.janitor.JanitorRuleEngine;

import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -169,7 +171,9 @@ private ASGJanitor getASGJanitor() {
ASGInstanceValidator instanceValidator;
if (discoveryEnabled) {
LOGGER.info("Initializing Discovery client.");
instanceValidator = new DiscoveryASGInstanceValidator(DiscoveryManager.getInstance().getDiscoveryClient());
Injector injector = Guice.createInjector(new EurekaModule());
DiscoveryClient discoveryClient = injector.getInstance(DiscoveryClient.class);
instanceValidator = new DiscoveryASGInstanceValidator(discoveryClient);
} else {
LOGGER.info("Discovery/Eureka is not enabled, use the dummy instance validator.");
instanceValidator = new DummyASGInstanceValidator();
Expand Down