usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdun...@apache.org
Subject usergrid git commit: Change swapped config items
Date Wed, 06 Dec 2017 02:13:07 GMT
Repository: usergrid
Updated Branches:
  refs/heads/hotfix_20171205 [created] cda4d207a


Change swapped config items

usergrid.cluster.region* - Akka cluster region config
usergrid.queue.region* - SQS region config


Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/cda4d207
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/cda4d207
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/cda4d207

Branch: refs/heads/hotfix_20171205
Commit: cda4d207ae71753a388e258f8d46d2d476adfa87
Parents: 4a65910
Author: Mike Dunker <mdunker@google.com>
Authored: Tue Dec 5 18:11:22 2017 -0800
Committer: Mike Dunker <mdunker@google.com>
Committed: Tue Dec 5 18:11:22 2017 -0800

----------------------------------------------------------------------
 .../apache/usergrid/corepersistence/EntityManagerFig.java    | 2 +-
 .../apache/usergrid/persistence/queue/LegacyQueueFig.java    | 8 ++++----
 .../usergrid/persistence/queue/impl/SNSQueueManagerImpl.java | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid/blob/cda4d207/stack/core/src/main/java/org/apache/usergrid/corepersistence/EntityManagerFig.java
----------------------------------------------------------------------
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 @@ public interface EntityManagerFig extends GuicyFig {
      * 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();
 

http://git-wip-us.apache.org/repos/asf/usergrid/blob/cda4d207/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/LegacyQueueFig.java
----------------------------------------------------------------------
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 @@ public interface LegacyQueueFig extends GuicyFig {
      * 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 @@ public interface LegacyQueueFig extends GuicyFig {
      * 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();
 

http://git-wip-us.apache.org/repos/asf/usergrid/blob/cda4d207/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/SNSQueueManagerImpl.java
----------------------------------------------------------------------
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 @@ public class SNSQueueManagerImpl implements LegacyQueueManager {
                     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 @@ public class SNSQueueManagerImpl implements LegacyQueueManager {
             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);
         }
     }
 


Mime
View raw message