Change swapped config items
usergrid.cluster.region* - Akka cluster region config
usergrid.queue.region* - SQS region config
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/EntityManagerFig.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/EntityManagerFig.java
index 46c7a1d..3c8a53f 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/EntityManagerFig.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/EntityManagerFig.java
@@ -46,7 +46,7 @@
* Comma-separated list of one or more Amazon regions to use if multiregion
* is set to true.
*/
- @Key( "usergrid.queue.regionList" )
+ @Key( "usergrid.cluster.region.list" )
@Default("us-east-1")
String getRegionList();
diff --git a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/LegacyQueueFig.java b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/LegacyQueueFig.java
index f19bede..c399636 100644
--- a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/LegacyQueueFig.java
+++ b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/LegacyQueueFig.java
@@ -14,14 +14,14 @@
* http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-regions-availability-zones.html*
*/
- String USERGRID_CLUSTER_REGION_LIST = "usergrid.cluster.region.list";
- String USERGRID_CLUSTER_REGION_LOCAL = "usergrid.cluster.region.local";
+ String USERGRID_QUEUE_REGION_LIST = "usergrid.queue.regionList";
+ String USERGRID_QUEUE_REGION_LOCAL = "usergrid.queue.region";
/**
* Primary region to use for Amazon queues.
*/
- @Key( USERGRID_CLUSTER_REGION_LOCAL )
+ @Key(USERGRID_QUEUE_REGION_LOCAL)
@Default("us-east-1")
String getPrimaryRegion();
@@ -37,7 +37,7 @@
* Comma-separated list of one or more Amazon regions to use if multiregion
* is set to true.
*/
- @Key( USERGRID_CLUSTER_REGION_LIST )
+ @Key(USERGRID_QUEUE_REGION_LIST)
@Default("us-east-1")
String getRegionList();
diff --git a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/SNSQueueManagerImpl.java b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/SNSQueueManagerImpl.java
index bc9be57..b5d52dc 100644
--- a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/SNSQueueManagerImpl.java
+++ b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/SNSQueueManagerImpl.java
@@ -248,7 +248,7 @@
region = Region.getRegion(regions);
}
catch (IllegalArgumentException e) {
- throw new IllegalArgumentException("INVALID REGION FROM CONFIGURATION " + LegacyQueueFig.USERGRID_CLUSTER_REGION_LIST + ": " + regionName, e);
+ throw new IllegalArgumentException("INVALID REGION FROM CONFIGURATION " + LegacyQueueFig.USERGRID_QUEUE_REGION_LIST + ": " + regionName, e);
}
AmazonSQSClient sqsClient = createSQSClient( region );
@@ -825,7 +825,7 @@
return Region.getRegion(regions);
}
catch (IllegalArgumentException e) {
- throw new IllegalArgumentException("INVALID PRIMARY REGION FROM CONFIGURATION " + LegacyQueueFig.USERGRID_CLUSTER_REGION_LOCAL + ": " + regionName, e);
+ throw new IllegalArgumentException("INVALID PRIMARY REGION FROM CONFIGURATION " + LegacyQueueFig.USERGRID_QUEUE_REGION_LOCAL + ": " + regionName, e);
}
}
