Merge branch 'master' of git://git.apache.org/usergrid into USERGRID-1195
Conflicts:
stack/services/src/main/java/org/apache/usergrid/services/notifications/QueueListener.java
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/000e1ced
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/000e1ced
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/000e1ced
Branch: refs/heads/master
Commit: 000e1ced3180c2ca2c79efa2756480addc8bc457
Parents: bc33c88 d6f597a
Author: Jeff West <[email protected]>
Authored: Thu Jan 7 16:45:31 2016 -0800
Committer: Jeff West <[email protected]>
Committed: Thu Jan 7 16:45:31 2016 -0800
----------------------------------------------------------------------
sdks/nodejs/lib/usergrid.js | 4 +-
.../persistence/entities/Notification.java | 167 +++++++++-----
.../usergrid/persistence/entities/Notifier.java | 51 +++--
.../persistence/queue/LocalQueueManager.java | 5 +
stack/pom.xml | 5 +-
.../organizations/users/UsersResource.java | 2 +-
.../rest/management/users/UsersResource.java | 2 +-
.../organizations/OrganizationsResource.java | 4 +-
.../rest/system/ApplicationsResource.java | 4 +-
.../usergrid/rest/system/IndexResource.java | 2 +-
.../usergrid/rest/system/MigrateResource.java | 2 +-
.../rest/test/RefreshIndexResource.java | 2 +-
.../rest/management/OrganizationsIT.java | 61 +++++
stack/services/pom.xml | 3 +-
.../cassandra/ManagementServiceImpl.java | 9 +
.../notifications/NotificationsService.java | 24 +-
.../services/notifications/ProviderAdapter.java | 5 +-
.../services/notifications/QueueListener.java | 14 +-
.../services/notifications/TestAdapter.java | 6 +-
.../notifications/apns/APNsAdapter.java | 9 +-
.../services/notifications/gcm/GCMAdapter.java | 93 ++++++--
.../impl/ApplicationQueueManagerImpl.java | 2 +-
.../services/notifications/wns/WNSAdapter.java | 3 +-
.../AbstractServiceNotificationIT.java | 2 +-
.../apns/MockSuccessfulProviderAdapter.java | 4 +-
.../apns/NotificationsServiceIT.java | 22 +-
.../gcm/MockSuccessfulProviderAdapter.java | 7 +-
.../gcm/NotificationsServiceIT.java | 229 +++++++++++++++----
.../notifications/wns/WNSAdapterTest.java | 5 -
29 files changed, 529 insertions(+), 219 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/000e1ced/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationsService.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/000e1ced/stack/services/src/main/java/org/apache/usergrid/services/notifications/QueueListener.java
----------------------------------------------------------------------
diff --cc
stack/services/src/main/java/org/apache/usergrid/services/notifications/QueueListener.java
index e7d36e2,8ce4e17..1ab1db1
---
a/stack/services/src/main/java/org/apache/usergrid/services/notifications/QueueListener.java
+++
b/stack/services/src/main/java/org/apache/usergrid/services/notifications/QueueListener.java
@@@ -113,33 -113,38 +113,39 @@@ public class QueueListener
pool = Executors.newFixedThreadPool(maxThreads);
while (threadCount++ < maxThreads) {
- LOG.info("QueueListener: Starting thread {}.",
threadCount);
+ logger.info("QueueListener: Starting thread {}.",
threadCount);
+ final int threadNumber = threadCount;
Runnable task = new Runnable() {
@Override
public void run() {
try {
- execute();
+ execute(threadNumber);
} catch (Exception e) {
- logger.error("failed to start push", e);
++
+ if(pool.isShutdown()){
- LOG.warn("QueueListener: push listener
pool already shut down.");
++ logger.warn("QueueListener: push listener
pool already shut down.");
+ }else{
- LOG.error("QueueListener: threads
interrupted", e);
++ logger.error("QueueListener: threads
interrupted", e);
+ }
}
}
};
futures.add( pool.submit(task));
}
} catch (Exception e) {
- LOG.error("QueueListener: failed to start", e);
+ logger.error("QueueListener: failed to start:", e);
}
- LOG.info("QueueListener: done starting.");
+ logger.info("QueueListener: done starting.");
}
- private void execute(){
+ private void execute(int threadNumber){
if(Thread.currentThread().isDaemon()) {
Thread.currentThread().setDaemon(true);
}
-
Thread.currentThread().setName("Notifications_Processor"+UUID.randomUUID());
+
Thread.currentThread().setName(getClass().getSimpleName()+"_PushNotifications-"+threadNumber);
final AtomicInteger consecutiveExceptions = new AtomicInteger();
- LOG.info("QueueListener: Starting execute process.");
+ logger.info("QueueListener: Starting execute process.");
Meter meter = metricsService.getMeter(QueueListener.class,
"execute.commit");
com.codahale.metrics.Timer timer =
metricsService.getTimer(QueueListener.class, "execute.dequeue");
svcMgr = smf.getServiceManager(smf.getManagementAppId());
http://git-wip-us.apache.org/repos/asf/usergrid/blob/000e1ced/stack/services/src/main/java/org/apache/usergrid/services/notifications/impl/ApplicationQueueManagerImpl.java
----------------------------------------------------------------------
diff --cc
stack/services/src/main/java/org/apache/usergrid/services/notifications/impl/ApplicationQueueManagerImpl.java
index 35dcd5c,7da6e03..22b7d51
---
a/stack/services/src/main/java/org/apache/usergrid/services/notifications/impl/ApplicationQueueManagerImpl.java
+++
b/stack/services/src/main/java/org/apache/usergrid/services/notifications/impl/ApplicationQueueManagerImpl.java
@@@ -90,9 -90,9 +90,9 @@@ public class ApplicationQueueManagerImp
return;
}
- LOG.info("notification {} start queuing", notification.getUuid());
+ logger.info("notification {} start queuing", notification.getUuid());
- final PathQuery<Device> pathQuery =
notification.getPathTokens().getPathQuery() ; //devices query
+ final PathQuery<Device> pathQuery =
notification.getPathQuery().buildPathQuery() ; //devices query
final AtomicInteger deviceCount = new AtomicInteger(); //count
devices so you can make a judgement on batching
final ConcurrentLinkedQueue<String> errorMessages = new
ConcurrentLinkedQueue<String>(); //build up list of issues
http://git-wip-us.apache.org/repos/asf/usergrid/blob/000e1ced/stack/services/src/main/java/org/apache/usergrid/services/notifications/wns/WNSAdapter.java
----------------------------------------------------------------------
