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 2014/08/22 01:38:41 UTC
[2/4] git commit: change queue job behavior to requeue
change queue job behavior to requeue
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/1fb0a82a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/1fb0a82a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/1fb0a82a
Branch: refs/heads/two-dot-o-notifications-queue
Commit: 1fb0a82a9154d11613af17ac994528f573649156
Parents: 610bdf3
Author: Shawn Feldman <sf...@apache.org>
Authored: Thu Aug 21 16:40:46 2014 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Thu Aug 21 16:40:46 2014 -0600
----------------------------------------------------------------------
.../notifications/NotificationBatchJob.java | 2 +-
.../services/notifications/NotificationJob.java | 2 +-
.../notifications/NotificationsQueueManager.java | 16 ++--------------
3 files changed, 4 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1fb0a82a/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationBatchJob.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationBatchJob.java b/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationBatchJob.java
index 05fd360..94b4de9 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationBatchJob.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationBatchJob.java
@@ -102,7 +102,7 @@ public class NotificationBatchJob implements Job {
try {
- notificationsService.getQueueManager().processBatchAndReschedule( notification, jobExecution );
+ notificationsService.getQueueManager().queueNotification( notification, jobExecution );
}
catch ( Exception e ) {
logger.error( "execute NotificationBatchJob failed", e );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1fb0a82a/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationJob.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationJob.java b/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationJob.java
index 4cf8c2f..3db4b79 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationJob.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationJob.java
@@ -99,7 +99,7 @@ public class NotificationJob extends OnlyOnceJob {
}
try {
- notificationsService.getQueueManager().processBatchAndReschedule( notification, jobExecution );
+ notificationsService.getQueueManager().queueNotification( notification, jobExecution );
}
catch ( Exception e ) {
logger.error( "execute NotificationJob failed", e );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1fb0a82a/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationsQueueManager.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationsQueueManager.java b/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationsQueueManager.java
index fab78d8..6e3dc48 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationsQueueManager.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationsQueueManager.java
@@ -236,19 +236,7 @@ public class NotificationsQueueManager implements NotificationServiceProxy {
private void clearNotifierMap(){
notifierCacheMap.invalidate(em);
}
- /*
- * returns partial list of Device EntityRefs (up to BATCH_SIZE) - empty when
- * done w/ delivery
- */
- private QueueResults getDeliveryBatch(EntityRef notification, int batchSize) throws Exception {
-
- QueueQuery qq = new QueueQuery();
- qq.setLimit(batchSize);
- qq.setTimeout(MESSAGE_TRANSACTION_TIMEOUT);
- QueueResults results = qm.getFromQueue(getJobQueueName(notification), qq);
- LOG.debug("got batch of {} devices for notification {}", results.size(), notification.getUuid());
- return results;
- }
+
/**
* send batches of notifications to provider
@@ -318,7 +306,7 @@ public class NotificationsQueueManager implements NotificationServiceProxy {
}
Object payload = translatedPayloads.get(payloadKey);
- Receipt receipt = new Receipt(notification.getUuid(), providerId, payload, deviceUUID);
+ Receipt receipt = new Receipt(notification.getUuid(), providerId, payload, deviceUUID,message);
TaskTracker tracker = new TaskTracker(notifier, taskManager, receipt, deviceUUID);
if (payload == null) {
LOG.debug("selected device {} for notification {} doesn't have a valid payload. skipping.", deviceUUID, notification.getUuid());