You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2015/03/31 23:28:02 UTC
incubator-usergrid git commit: merge from two-o-dev
Repository: incubator-usergrid
Updated Branches:
refs/heads/USERGRID-473 89af71186 -> a4eae15af
merge from two-o-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/a4eae15a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/a4eae15a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/a4eae15a
Branch: refs/heads/USERGRID-473
Commit: a4eae15afb854a5e8851cf99544056b6d60ba63e
Parents: 89af711
Author: Shawn Feldman <sf...@apache.org>
Authored: Tue Mar 31 15:27:59 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Tue Mar 31 15:27:59 2015 -0600
----------------------------------------------------------------------
.../org/apache/usergrid/persistence/queue/QueueFig.java | 11 +++++++++--
.../persistence/queue/impl/SQSQueueManagerImpl.java | 2 +-
2 files changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a4eae15a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/QueueFig.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/QueueFig.java b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/QueueFig.java
index 197b791..9760b85 100644
--- a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/QueueFig.java
+++ b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/QueueFig.java
@@ -10,10 +10,17 @@ public interface QueueFig extends GuicyFig {
@Key( "usergrid.queue.region" )
@Default("us-east-1")
- public String getRegion();
+ String getRegion();
@Key( "usergrid.queue.prefix" )
@Default("usergrid")
- public String getPrefix();
+ String getPrefix();
+ @Key("usergrid.queue.arn")
+ @Default("arn:aws:sqs:us-east-1:123456789012")
+ String getArn();
+
+ @Key( "usergrid.queue.max.receive" )
+ @Default("5")
+ long getMaxReceiveCount();
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a4eae15a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/SQSQueueManagerImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/SQSQueueManagerImpl.java b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/SQSQueueManagerImpl.java
index d368a7f..3c63148 100644
--- a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/SQSQueueManagerImpl.java
+++ b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/SQSQueueManagerImpl.java
@@ -118,7 +118,7 @@ public class SQSQueueManagerImpl implements QueueManager {
public Queue getQueue() {
try {
- Queue queue = urlMap.get(new SqsLoader(getName(), sqs));
+ Queue queue = urlMap.get(getName());
return queue;
} catch (ExecutionException ee) {
throw new RuntimeException(ee);