这是indexloc提供的服务,不要输入任何密码
Skip to content
This repository was archived by the owner on Mar 4, 2021. It is now read-only.
Open
Changes from all commits
Commits
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
18 changes: 10 additions & 8 deletions src/main/java/com/netflix/simianarmy/client/aws/AWSClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ public class AWSClient implements CloudClient {
private final ClientConfiguration awsClientConfig;

private ComputeService jcloudsComputeService;



/**
* This constructor will let the AWS SDK obtain the credentials, which will
Expand Down Expand Up @@ -302,28 +302,30 @@ protected AmazonRoute53Client route53Client() {
public AmazonSimpleDB sdbClient() {
AmazonSimpleDB client;
ClientConfiguration cc = awsClientConfig;
if (cc == null) {

if (cc == null) {
cc = new ClientConfiguration();
cc.setMaxErrorRetry(SIMPLE_DB_MAX_RETRY);
}

if (awsCredentialsProvider == null) {
client = new AmazonSimpleDBClient(cc);
} else {
client = new AmazonSimpleDBClient(awsCredentialsProvider, cc);
}

// us-east-1 has special naming
// http://docs.amazonwebservices.com/general/latest/gr/rande.html#sdb_region
if (region == null || region.equals("us-east-1")) {
client.setEndpoint("sdb.amazonaws.com");
} else {
} else if (region.contains("eu-west")) {
client.setEndpoint("sdb.eu-west-1.amazonaws.com");
} else
client.setEndpoint("sdb." + region + ".amazonaws.com");
}
return client;
}

/**
* Describe auto scaling groups.
*
Expand Down