Repository: incubator-usergrid Updated Branches: refs/heads/sqs_queues f01b2547b -> d4c90d81a
organization Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/80255960 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/80255960 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/80255960 Branch: refs/heads/sqs_queues Commit: 80255960279ba133b1a4447ccd4a9bb9d8bc9058 Parents: f01b254 Author: Shawn Feldman <[email protected]> Authored: Fri Oct 3 19:28:41 2014 -0600 Committer: Shawn Feldman <[email protected]> Committed: Fri Oct 3 19:28:41 2014 -0600 ---------------------------------------------------------------------- .../notifications/ApplicationQueueManager.java | 9 +++------ .../apns/NotificationsServiceIT.java | 20 ++++++++------------ 2 files changed, 11 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/80255960/stack/services/src/main/java/org/apache/usergrid/services/notifications/ApplicationQueueManager.java ---------------------------------------------------------------------- diff --git a/stack/services/src/main/java/org/apache/usergrid/services/notifications/ApplicationQueueManager.java b/stack/services/src/main/java/org/apache/usergrid/services/notifications/ApplicationQueueManager.java index bb0061d..ad10c08 100644 --- a/stack/services/src/main/java/org/apache/usergrid/services/notifications/ApplicationQueueManager.java +++ b/stack/services/src/main/java/org/apache/usergrid/services/notifications/ApplicationQueueManager.java @@ -112,7 +112,6 @@ public class ApplicationQueueManager { final ConcurrentLinkedQueue<String> errorMessages = new ConcurrentLinkedQueue<String>(); //build up list of issues final HashMap<Object,Notifier> notifierMap = getNotifierMap(); - final List<ApplicationQueueMessage> messages = new ArrayList<>(); //get devices in querystring, and make sure you have access if (pathQuery != null) { @@ -128,7 +127,6 @@ public class ApplicationQueueManager { final UUID appId = em.getApplication().getUuid(); final Map<String,Object> payloads = notification.getPayloads(); - final Func1<Entity,Entity> entityListFunct = new Func1<Entity, Entity>() { @Override public Entity call(Entity entity) { @@ -144,7 +142,7 @@ public class ApplicationQueueManager { LOG.info("ApplicationQueueMessage: notification {} starting to queue device {} ", notification.getUuid(), deviceRef.getUuid()); long hash = MurmurHash.hash(deviceRef.getUuid()); if (sketch.estimateCount(hash) > 0) { //look for duplicates - LOG.debug("ApplicationQueueMessage: Maybe Found duplicate device: {}", deviceRef.getUuid()); + LOG.warn("ApplicationQueueMessage: Maybe Found duplicate device: {}", deviceRef.getUuid()); continue; } else { sketch.add(hash, 1); @@ -166,7 +164,7 @@ public class ApplicationQueueManager { } if (notifierId == null) { - LOG.debug("ApplicationQueueMessage: Notifier did not match for device {} ", deviceRef); + LOG.info("ApplicationQueueMessage: Notifier did not match for device {} ", deviceRef); continue; } @@ -178,8 +176,7 @@ public class ApplicationQueueManager { LOG.info("ApplicationQueueMessage: notification {} device {} queue time set. duration "+(System.currentTimeMillis()-now)+" ms", notification.getUuid(), deviceRef.getUuid()); } now = System.currentTimeMillis(); - - qm.sendMessage(message); + qm.sendMessage(message); LOG.info("ApplicationQueueMessage: notification {} post-queue to device {} duration " + (System.currentTimeMillis() - now) + " ms "+queueName+" queue", notification.getUuid(), deviceRef.getUuid()); deviceCount.incrementAndGet(); queueMeter.mark(); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/80255960/stack/services/src/test/java/org/apache/usergrid/services/notifications/apns/NotificationsServiceIT.java ---------------------------------------------------------------------- diff --git a/stack/services/src/test/java/org/apache/usergrid/services/notifications/apns/NotificationsServiceIT.java b/stack/services/src/test/java/org/apache/usergrid/services/notifications/apns/NotificationsServiceIT.java index 1a8d8f9..3d83404 100644 --- a/stack/services/src/test/java/org/apache/usergrid/services/notifications/apns/NotificationsServiceIT.java +++ b/stack/services/src/test/java/org/apache/usergrid/services/notifications/apns/NotificationsServiceIT.java @@ -93,10 +93,8 @@ public class NotificationsServiceIT extends AbstractServiceNotificationIT { app.clear(); app.put(notifierKey, PUSH_TOKEN); app.put("name", "device1"); - e = app.testRequest(ServiceAction.POST, 1, "devices").getEntity(); app.testRequest(ServiceAction.GET, 1, "devices", e.getUuid()); - device1 = app.getEm().get(e.getUuid(), Device.class); assertEquals(device1.getProperty(notifierKey), PUSH_TOKEN); @@ -105,6 +103,9 @@ public class NotificationsServiceIT extends AbstractServiceNotificationIT { app.put("name", "device2"); e = app.testRequest(ServiceAction.POST, 1, "devices").getEntity(); device2 = app.getEm().get(e.getUuid(), Device.class); + Map<String, Object> props = app.getEm().getProperties(e); + assertEquals(device2.getProperty(notifierKey), PUSH_TOKEN); + app.getEm().refreshIndex(); // create User user1 = new User(); @@ -130,6 +131,7 @@ public class NotificationsServiceIT extends AbstractServiceNotificationIT { PathQuery pathQuery = new PathQuery( new SimpleEntityRef(app.getEm().getApplicationRef()), query); ns.TEST_PATH_QUERY = pathQuery; + app.getEm().refreshIndex(); listener = new QueueListener(ns.getServiceManagerFactory(),ns.getEntityManagerFactory(),ns.getMetricsFactory(), new Properties()); listener.DEFAULT_SLEEP = 200; @@ -465,24 +467,18 @@ public class NotificationsServiceIT extends AbstractServiceNotificationIT { public void twoDevicesOneNotifier() throws Exception { // create push notification // - - app.clear(); String payload = getPayload(); Map<String, String> payloads = new HashMap<String, String>(1); - payloads.put(notifier.getUuid().toString(), payload); + payloads.put(notifier.getName().toString(), payload); app.put("payloads", payloads); app.put("queued", System.currentTimeMillis()); - Entity e = app.testRequest(ServiceAction.POST, 1, "notifications") - .getEntity(); + Entity e = app.testRequest(ServiceAction.POST, 1, "notifications").getEntity(); app.testRequest(ServiceAction.GET, 1, "notifications", e.getUuid()); - Notification notification = app.getEm().get(e.getUuid(), - Notification.class); - assertEquals( - notification.getPayloads().get(notifier.getUuid().toString()), - payload); + Notification notification = app.getEm().get(e.getUuid(),Notification.class); + assertEquals(notification.getPayloads().get(notifier.getUuid().toString()),payload); // perform push //
