Return-Path: X-Original-To: apmail-usergrid-commits-archive@minotaur.apache.org Delivered-To: apmail-usergrid-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CC3C818B47 for ; Tue, 20 Oct 2015 18:02:05 +0000 (UTC) Received: (qmail 11948 invoked by uid 500); 20 Oct 2015 18:02:05 -0000 Delivered-To: apmail-usergrid-commits-archive@usergrid.apache.org Received: (qmail 11912 invoked by uid 500); 20 Oct 2015 18:02:05 -0000 Mailing-List: contact commits-help@usergrid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@usergrid.apache.org Delivered-To: mailing list commits@usergrid.apache.org Received: (qmail 11743 invoked by uid 99); 20 Oct 2015 18:02:05 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Oct 2015 18:02:05 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2412CE01CA; Tue, 20 Oct 2015 18:02:05 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mrusso@apache.org To: commits@usergrid.apache.org Date: Tue, 20 Oct 2015 18:02:15 -0000 Message-Id: In-Reply-To: <58c166be647d44999798194bad3e0407@git.apache.org> References: <58c166be647d44999798194bad3e0407@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [12/12] usergrid git commit: Fixes incorrect units on timeout from millis to seconds. Fixes incorrect units on timeout from millis to seconds. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/1fe1d1a3 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/1fe1d1a3 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/1fe1d1a3 Branch: refs/heads/2.1-release Commit: 1fe1d1a34e806ebfc53d0c6cb729e7e4aab804a1 Parents: e50835f Author: Todd Nine Authored: Tue Oct 20 11:37:03 2015 -0600 Committer: Todd Nine Committed: Tue Oct 20 11:44:35 2015 -0600 ---------------------------------------------------------------------- .../corepersistence/asyncevents/AmazonAsyncEventService.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/1fe1d1a3/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AmazonAsyncEventService.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AmazonAsyncEventService.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AmazonAsyncEventService.java index 6f779b5..7034a67 100644 --- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AmazonAsyncEventService.java +++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AmazonAsyncEventService.java @@ -25,6 +25,7 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; import java.util.UUID; +import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -491,8 +492,11 @@ public class AmazonAsyncEventService implements AsyncEventService { final UUID newMessageId = UUIDGenerator.newTimeUUID(); + final int expirationTimeInSeconds = + ( int ) TimeUnit.MILLISECONDS.toSeconds( indexProcessorFig.getIndexMessageTtl() ); + //write to the map in ES - esMapPersistence.putString( newMessageId.toString(), jsonValue, indexProcessorFig.getIndexMessageTtl() ); + esMapPersistence.putString( newMessageId.toString(), jsonValue, expirationTimeInSeconds );