usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [21/30] usergrid git commit: merge
Date Wed, 21 Oct 2015 14:03:57 GMT
merge


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

Branch: refs/heads/usergrid-1007-shiro-cache
Commit: 68befd2f04d03dbd3e9370af89c257a8a28112a1
Parents: 00175cc
Author: Shawn Feldman <sfeldman@apache.org>
Authored: Mon Oct 19 15:13:34 2015 -0600
Committer: Shawn Feldman <sfeldman@apache.org>
Committed: Mon Oct 19 15:13:34 2015 -0600

----------------------------------------------------------------------
 .../index/IndexProcessorFig.java                | 36 ++++++--------------
 1 file changed, 11 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid/blob/68befd2f/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexProcessorFig.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexProcessorFig.java
b/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexProcessorFig.java
index 113b539..8a8c8a5 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexProcessorFig.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexProcessorFig.java
@@ -49,15 +49,15 @@ public interface IndexProcessorFig extends GuicyFig {
      * Set the amount of time to wait when Elasticsearch rejects a requests before
      * retrying.  This provides simple back pressure. (in milliseconds)
      */
-    @Default( "1000" )
-    @Key( FAILURE_REJECTED_RETRY_WAIT_TIME )
+    @Default("1000")
+    @Key(FAILURE_REJECTED_RETRY_WAIT_TIME)
     long getFailureRetryTime();
 
     /**
      * Set the read timeout for processing messages in the queue. (in milliseconds)
      */
-    @Default( "10000" )
-    @Key( INDEX_QUEUE_READ_TIMEOUT )
+    @Default("10000")
+    @Key(INDEX_QUEUE_READ_TIMEOUT)
     int getIndexQueueTimeout();
 
     /**
@@ -65,15 +65,15 @@ public interface IndexProcessorFig extends GuicyFig {
      * Received messages will remain 'in flight' until they are ack'd(deleted) or this timeout
occurs.
      * If the timeout occurs, the messages will become visible again for re-processing.
      */
-    @Default( "5000" ) // 5 seconds
-    @Key( INDEX_QUEUE_VISIBILITY_TIMEOUT )
+    @Default("5000") // 5 seconds
+    @Key(INDEX_QUEUE_VISIBILITY_TIMEOUT)
     int getIndexQueueVisibilityTimeout();
 
     /**
      * The number of worker threads used to read index write requests from the queue.
      */
-    @Default( "16" )
-    @Key( ELASTICSEARCH_WORKER_COUNT )
+    @Default("16")
+    @Key(ELASTICSEARCH_WORKER_COUNT)
     int getWorkerCount();
 
     /**
@@ -81,26 +81,12 @@ public interface IndexProcessorFig extends GuicyFig {
      * Valid values: TEST, LOCAL, SQS, SNS
      * NOTE: SQS and SNS equate to the same implementation of Amazon queue services.
      */
-    @Default( "LOCAL" )
-    @Key( ELASTICSEARCH_QUEUE_IMPL )
+    @Default("LOCAL")
+    @Key(ELASTICSEARCH_QUEUE_IMPL)
     String getQueueImplementation();
 
     @Default("1000")
-    @Key("elasticsearch.reindex.flush.interval")
-    int getUpdateInterval();
-
-    @Default("100")
-    @Key("elasticsearch.buffer.time_ms")
-    int getBufferTime();
-
-    @Default("1000")
-    @Key( REINDEX_BUFFER_SIZE )
+    @Key(REINDEX_BUFFER_SIZE)
     int getReindexBufferSize();
 
-    /**
-     * Flag to resolve the LOCAL queue implementation service synchronously.
-     */
-    @Default("false")
-    @Key("elasticsearch.queue_impl.resolution")
-    boolean resolveSynchronously();
 }


Mime
View raw message