Update AwsUtil.java

From pull request Netflix#102
vermapratyush · Jan 6, 2017 · f2c83bf · f2c83bf
1 parent 3530bba
commit f2c83bf
Showing 1 changed file with 16 additions and 8 deletions.
diff --git a/turbine-contrib/src/main/java/com/netflix/turbine/discovery/AwsUtil.java b/turbine-contrib/src/main/java/com/netflix/turbine/discovery/AwsUtil.java
@@ -48,12 +48,20 @@ public class AwsUtil {
     private final AmazonEC2Client ec2Client;
 
     public AwsUtil() {
-    	asgClient = new AmazonAutoScalingClient();
-    	ec2Client = new AmazonEC2Client();
-
-    	String endpoint = "autoscaling." + DynamicPropertyFactory.getInstance().getStringProperty("turbine.region", "us-east-1").get() + ".amazonaws.com";    	
-    	asgClient.setEndpoint(endpoint);    	
-    	logger.debug("Set the asgClient endpoint to [{}]", endpoint);
+        String region = DynamicPropertyFactory.getInstance().getStringProperty("turbine.region", "us-east-1").get();
+        String ec2Endpoint = "ec2." + region + ".amazonaws.com";
+
+        ec2Client = new AmazonEC2Client();
+        ec2Client.setEndpoint(ec2Endpoint);
+
+        logger.debug("Set the ec2Client ec2Endpoint to [{}]", ec2Endpoint);
+
+        String asgEndpoint = "autoscaling." + region + ".amazonaws.com";
+
+        asgClient = new AmazonAutoScalingClient();
+        asgClient.setEndpoint(asgEndpoint);
+
+    	logger.debug("Set the asgClient asgEndpoint to [{}]", asgEndpoint);
     }
 
     /**
@@ -112,10 +120,10 @@ public String apply(com.amazonaws.services.autoscaling.model.Instance asgInstanc
 
     			String statusName = ec2Instance.getState().getName();
     			boolean status = statusName.equals("running"); // see com.amazonaws.services.ec2.model.InstanceState for values
-    			
+
     			Instance turbineInstance = new Instance(hostname, asgName, status);
     			turbineInstance.getAttributes().put("asg", asgName);
-    			
+
     			turbineInstances.add(turbineInstance);
     		}    		
     	}