usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [34/50] [abbrv] usergrid git commit: USERGRID-1243: logging overhaul, pt. 2
Date Thu, 04 Feb 2016 17:57:58 GMT
http://git-wip-us.apache.org/repos/asf/usergrid/blob/54e62f95/stack/services/src/main/java/org/apache/usergrid/services/assets/data/AwsSdkS3BinaryStore.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/assets/data/AwsSdkS3BinaryStore.java b/stack/services/src/main/java/org/apache/usergrid/services/assets/data/AwsSdkS3BinaryStore.java
index 47a99c0..458d9a5 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/assets/data/AwsSdkS3BinaryStore.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/assets/data/AwsSdkS3BinaryStore.java
@@ -105,7 +105,7 @@ public class  AwsSdkS3BinaryStore implements BinaryStore {
 
         this.bucketName = properties.getProperty( "usergrid.binary.bucketname" );
         if(bucketName == null){
-            logger.error( "usergrid.binary.bucketname  not properly set so amazon bucket is null" );
+            logger.error( "usergrid.binary.bucketname not properly set so amazon bucket is null" );
             throw new AwsPropertiesNotFoundException( "usergrid.binary.bucketname" );
 
         }
@@ -213,7 +213,7 @@ public class  AwsSdkS3BinaryStore implements BinaryStore {
 
                     if(written> maxSizeBytes){
                         overSizeLimit = true;
-                        logger.error( "OVERSIZED FILE. STARTING ABORT" );
+                        logger.error( "OVERSIZED FILE ({}). STARTING ABORT", written );
                         break;
                         //set flag here and break out of loop to run abort
                     }
@@ -268,7 +268,7 @@ public class  AwsSdkS3BinaryStore implements BinaryStore {
                     timesIterated--;
                     listResult = getS3Client().listMultipartUploads( listRequest );
                     if (logger.isDebugEnabled()) {
-                        logger.debug("Files that haven't been aborted are: ", listResult.getMultipartUploads().listIterator().toString());
+                        logger.debug("Files that haven't been aborted are: {}", listResult.getMultipartUploads().listIterator().toString());
                     }
 
                 }

http://git-wip-us.apache.org/repos/asf/usergrid/blob/54e62f95/stack/services/src/main/java/org/apache/usergrid/services/assets/data/LocalFileBinaryStore.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/assets/data/LocalFileBinaryStore.java b/stack/services/src/main/java/org/apache/usergrid/services/assets/data/LocalFileBinaryStore.java
index b167d13..d829016 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/assets/data/LocalFileBinaryStore.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/assets/data/LocalFileBinaryStore.java
@@ -39,7 +39,7 @@ import java.util.UUID;
 /** A binary store implementation using the local file system */
 public class LocalFileBinaryStore implements BinaryStore {
 
-    private static final Logger LOG = LoggerFactory.getLogger( LocalFileBinaryStore.class );
+    private static final Logger logger = LoggerFactory.getLogger( LocalFileBinaryStore.class );
 
     private String reposLocation = FileUtils.getTempDirectoryPath();
 
@@ -102,7 +102,7 @@ public class LocalFileBinaryStore implements BinaryStore {
                 em.update( entity );
 
             } catch ( Exception e ) {
-                LOG.error( "Error updating entity with error message", e);
+                logger.error( "Error updating entity with error message", e);
             }
             return;
         }

http://git-wip-us.apache.org/repos/asf/usergrid/blob/54e62f95/stack/services/src/main/java/org/apache/usergrid/services/assets/data/S3BinaryStore.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/assets/data/S3BinaryStore.java b/stack/services/src/main/java/org/apache/usergrid/services/assets/data/S3BinaryStore.java
index 8c5c180..2929d93 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/assets/data/S3BinaryStore.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/assets/data/S3BinaryStore.java
@@ -54,7 +54,7 @@ public class S3BinaryStore implements BinaryStore {
     private static final Iterable<? extends Module> MODULES = ImmutableSet
             .of( new JavaUrlHttpCommandExecutorServiceModule(), new Log4JLoggingModule(), new NettyPayloadModule() );
 
-    private static final Logger LOG = LoggerFactory.getLogger( S3BinaryStore.class );
+    private static final Logger logger = LoggerFactory.getLogger( S3BinaryStore.class );
     private static final long FIVE_MB = ( FileUtils.ONE_MB * 5 );
     private static String WORKERS_PROP_NAME = "usergrid.binary.upload-workers";
 
@@ -158,7 +158,7 @@ public class S3BinaryStore implements BinaryStore {
                 if ( StringUtils.isNumeric( workersString ) ) {
                     workers = Integer.parseInt( workersString );
                 } else if ( !StringUtils.isEmpty( workersString )) {
-                    LOG.error("Ignoring invalid setting for {}", WORKERS_PROP_NAME);
+                    logger.error("Ignoring invalid setting for {}", WORKERS_PROP_NAME);
                 }
                 executorService = Executors.newFixedThreadPool( workers );
             }
@@ -218,8 +218,8 @@ public class S3BinaryStore implements BinaryStore {
         @Override
         public Void call() {
 
-            if (LOG.isDebugEnabled()) {
-                LOG.debug("Writing temp file for S3 upload");
+            if (logger.isTraceEnabled()) {
+                logger.trace("Writing temp file for S3 upload");
             }
 
             // determine max size file allowed, default to 50mb
@@ -245,8 +245,8 @@ public class S3BinaryStore implements BinaryStore {
                 written += data.length;
                 written += IOUtils.copyLarge( inputStream, os, 0, maxSizeBytes + 1 );
 
-                if (LOG.isDebugEnabled()) {
-                    LOG.debug("Write temp file {} length {}", tempFile.getName(), written);
+                if (logger.isTraceEnabled()) {
+                    logger.trace("Write temp file {} length {}", tempFile.getName(), written);
                 }
 
             } catch ( IOException e ) {
@@ -257,7 +257,7 @@ public class S3BinaryStore implements BinaryStore {
                     try {
                         os.flush();
                     } catch (IOException e) {
-                        LOG.error( "Error flushing data to temporary upload file", e );
+                        logger.error( "Error flushing data to temporary upload file", e );
                     }
                     IOUtils.closeQuietly( os );
                 }
@@ -268,9 +268,9 @@ public class S3BinaryStore implements BinaryStore {
             Map<String, Object> fileMetadata = AssetUtils.getFileMetadata( entity );
 
             if ( tempFile.length() > maxSizeBytes ) {
-                if (LOG.isDebugEnabled()) {
-                    LOG.debug("File too large. Temp file size (bytes) = {}, " +
-                        "Max file size (bytes) = {} ", tempFile.length(), maxSizeBytes);
+                if (logger.isDebugEnabled()) {
+                    logger.debug("File too large. Temp file size (bytes) = {}, Max file size (bytes) = {}",
+                            tempFile.length(), maxSizeBytes);
                 }
                 try {
                     EntityManager em = emf.getEntityManager( appId );
@@ -280,7 +280,7 @@ public class S3BinaryStore implements BinaryStore {
                     tempFile.delete();
 
                 } catch ( Exception e ) {
-                    LOG.error( "Error updating entity with error message", e);
+                    logger.error( "Error updating entity with error message", e);
                 }
                 return null;
             }
@@ -290,8 +290,8 @@ public class S3BinaryStore implements BinaryStore {
 
             try {  // start the upload
 
-                if (LOG.isDebugEnabled()) {
-                    LOG.debug("S3 upload thread started");
+                if (logger.isTraceEnabled()) {
+                    logger.trace("S3 upload thread started");
                 }
 
                 BlobStore blobStore = getContext().getBlobStore();
@@ -314,14 +314,14 @@ public class S3BinaryStore implements BinaryStore {
                 String md5sum = Hex.encodeHexString( blob.getMetadata().getContentMetadata().getContentMD5() );
                 fileMetadata.put( AssetUtils.CHECKSUM, md5sum );
 
-                if (LOG.isDebugEnabled()) {
-                    LOG.debug("S3 upload starting");
+                if (logger.isTraceEnabled()) {
+                    logger.trace("S3 upload starting");
                 }
 
                 String eTag = blobStore.putBlob( bucketName, blob );
 
-                if (LOG.isDebugEnabled()) {
-                    LOG.debug("S3 upload complete eTag=" + eTag);
+                if (logger.isTraceEnabled()) {
+                    logger.trace("S3 upload complete eTag=" + eTag);
                 }
 
                 // update entity with eTag
@@ -332,7 +332,7 @@ public class S3BinaryStore implements BinaryStore {
                 em.update( entity );
             }
             catch ( Exception e ) {
-                LOG.error( "error uploading", e );
+                logger.error( "error uploading", e );
             }
 
             if ( tempFile != null && tempFile.exists() ) {

http://git-wip-us.apache.org/repos/asf/usergrid/blob/54e62f95/stack/services/src/main/java/org/apache/usergrid/services/devices/DevicesService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/devices/DevicesService.java b/stack/services/src/main/java/org/apache/usergrid/services/devices/DevicesService.java
index 7404dca..f57a03a 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/devices/DevicesService.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/devices/DevicesService.java
@@ -44,16 +44,16 @@ public class DevicesService extends AbstractCollectionService {
 
     public DevicesService() {
         super();
-        if (logger.isDebugEnabled()) {
-            logger.debug("/devices");
+        if (logger.isTraceEnabled()) {
+            logger.trace("/devices");
         }
     }
 
 
     @Override
     public ServiceResults putItemById( ServiceContext context, UUID id ) throws Exception {
-        if (logger.isDebugEnabled()) {
-            logger.debug("Registering device {}", id);
+        if (logger.isTraceEnabled()) {
+            logger.trace("Registering device {}", id);
         }
         return super.putItemById( context, id );
     }
@@ -61,7 +61,9 @@ public class DevicesService extends AbstractCollectionService {
 
     @Override
     public ServiceResults postItemById( ServiceContext context, UUID id ) throws Exception {
-        logger.info("Attempting to connect an entity to device {}", id);
+        if (logger.isTraceEnabled()) {
+            logger.trace("Attempting to connect an entity to device {}", id);
+        }
         return super.postItemById( context, id );
     }
 

http://git-wip-us.apache.org/repos/asf/usergrid/blob/54e62f95/stack/services/src/main/java/org/apache/usergrid/services/devices/notifications/NotificationsService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/devices/notifications/NotificationsService.java b/stack/services/src/main/java/org/apache/usergrid/services/devices/notifications/NotificationsService.java
index c766c72..8999f05 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/devices/notifications/NotificationsService.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/devices/notifications/NotificationsService.java
@@ -26,7 +26,9 @@ public class NotificationsService extends
             .getLogger(NotificationsService.class);
 
     public NotificationsService() {
-        logger.info("/devices/*/notifications");
+        if (logger.isTraceEnabled()) {
+            logger.trace("/devices/*/notifications");
+        }
     }
 
 }

http://git-wip-us.apache.org/repos/asf/usergrid/blob/54e62f95/stack/services/src/main/java/org/apache/usergrid/services/groups/GroupsService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/groups/GroupsService.java b/stack/services/src/main/java/org/apache/usergrid/services/groups/GroupsService.java
index c8ac153..01012aa 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/groups/GroupsService.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/groups/GroupsService.java
@@ -51,8 +51,8 @@ public class GroupsService extends AbstractPathBasedColllectionService {
 
     public GroupsService() {
         super();
-        if (logger.isDebugEnabled()) {
-            logger.debug("/groups");
+        if (logger.isTraceEnabled()) {
+            logger.trace("/groups");
         }
 
         // rolenames is the one case of Entity Dictionary name not equal to path segment
@@ -71,8 +71,8 @@ public class GroupsService extends AbstractPathBasedColllectionService {
             throw new IllegalArgumentException( "You must provide a 'path' property when creating a group" );
         }
 
-        if (logger.isDebugEnabled()) {
-            logger.debug("Creating group with path {}", path);
+        if (logger.isTraceEnabled()) {
+            logger.trace("Creating group with path {}", path);
         }
 
         Preconditions.checkArgument( matcher.matchesAllOf( path ), "Illegal characters found in group name: " + path );

http://git-wip-us.apache.org/repos/asf/usergrid/blob/54e62f95/stack/services/src/main/java/org/apache/usergrid/services/groups/activities/ActivitiesService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/groups/activities/ActivitiesService.java b/stack/services/src/main/java/org/apache/usergrid/services/groups/activities/ActivitiesService.java
index bed22aa..4b04edf 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/groups/activities/ActivitiesService.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/groups/activities/ActivitiesService.java
@@ -38,8 +38,8 @@ public class ActivitiesService extends GenericCollectionService {
 
     public ActivitiesService() {
         super();
-        if (logger.isDebugEnabled()) {
-            logger.debug("/groups/*/activities");
+        if (logger.isTraceEnabled()) {
+            logger.trace("/groups/*/activities");
         }
     }
 

http://git-wip-us.apache.org/repos/asf/usergrid/blob/54e62f95/stack/services/src/main/java/org/apache/usergrid/services/groups/notifications/NotificationsService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/groups/notifications/NotificationsService.java b/stack/services/src/main/java/org/apache/usergrid/services/groups/notifications/NotificationsService.java
index 9e965b5..e5949ef 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/groups/notifications/NotificationsService.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/groups/notifications/NotificationsService.java
@@ -26,7 +26,9 @@ public class NotificationsService extends
             .getLogger(NotificationsService.class);
 
     public NotificationsService() {
-        logger.info("/groups/*/notifications");
+        if (logger.isTraceEnabled()) {
+            logger.trace("/groups/*/notifications");
+        }
     }
 
 }

http://git-wip-us.apache.org/repos/asf/usergrid/blob/54e62f95/stack/services/src/main/java/org/apache/usergrid/services/groups/roles/RolesService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/groups/roles/RolesService.java b/stack/services/src/main/java/org/apache/usergrid/services/groups/roles/RolesService.java
index e01d15f..4915e51 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/groups/roles/RolesService.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/groups/roles/RolesService.java
@@ -28,8 +28,8 @@ public class RolesService extends org.apache.usergrid.services.roles.RolesServic
 
     public RolesService() {
         super();
-        if (logger.isDebugEnabled()) {
-            logger.debug("/groups/*/roles");
+        if (logger.isTraceEnabled()) {
+            logger.trace("/groups/*/roles");
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/usergrid/blob/54e62f95/stack/services/src/main/java/org/apache/usergrid/services/groups/users/UsersService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/groups/users/UsersService.java b/stack/services/src/main/java/org/apache/usergrid/services/groups/users/UsersService.java
index c3fd452..cb9709f 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/groups/users/UsersService.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/groups/users/UsersService.java
@@ -28,8 +28,8 @@ public class UsersService extends org.apache.usergrid.services.users.UsersServic
 
     public UsersService() {
         super();
-        if (logger.isDebugEnabled()) {
-            logger.debug("/groups/*/users");
+        if (logger.isTraceEnabled()) {
+            logger.trace("/groups/*/users");
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/usergrid/blob/54e62f95/stack/services/src/main/java/org/apache/usergrid/services/groups/users/activities/ActivitiesService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/groups/users/activities/ActivitiesService.java b/stack/services/src/main/java/org/apache/usergrid/services/groups/users/activities/ActivitiesService.java
index d815c10..7de9d8e 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/groups/users/activities/ActivitiesService.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/groups/users/activities/ActivitiesService.java
@@ -40,8 +40,8 @@ public class ActivitiesService extends GenericCollectionService {
 
     public ActivitiesService() {
         super();
-        if (logger.isDebugEnabled()) {
-            logger.debug("/groups/*/users/*/activities");
+        if (logger.isTraceEnabled()) {
+            logger.trace("/groups/*/users/*/activities");
         }
     }
 

http://git-wip-us.apache.org/repos/asf/usergrid/blob/54e62f95/stack/services/src/main/java/org/apache/usergrid/services/groups/users/devices/DevicesService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/groups/users/devices/DevicesService.java b/stack/services/src/main/java/org/apache/usergrid/services/groups/users/devices/DevicesService.java
index e9f8845..8ab4b67 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/groups/users/devices/DevicesService.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/groups/users/devices/DevicesService.java
@@ -28,8 +28,8 @@ public class DevicesService extends org.apache.usergrid.services.devices.Devices
 
     public DevicesService() {
         super();
-        if (logger.isDebugEnabled()) {
-            logger.debug("/groups/*/users/*/devices");
+        if (logger.isTraceEnabled()) {
+            logger.trace("/groups/*/users/*/devices");
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/usergrid/blob/54e62f95/stack/services/src/main/java/org/apache/usergrid/services/groups/users/devices/notifications/NotificationsService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/groups/users/devices/notifications/NotificationsService.java b/stack/services/src/main/java/org/apache/usergrid/services/groups/users/devices/notifications/NotificationsService.java
index 7587bd0..1a432c8 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/groups/users/devices/notifications/NotificationsService.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/groups/users/devices/notifications/NotificationsService.java
@@ -26,7 +26,9 @@ public class NotificationsService extends
             .getLogger(NotificationsService.class);
 
     public NotificationsService() {
-        logger.info("/groups/*/users/*/devices/*/notifications");
+        if (logger.isTraceEnabled()) {
+            logger.trace("/groups/*/users/*/devices/*/notifications");
+        }
     }
 
 }

http://git-wip-us.apache.org/repos/asf/usergrid/blob/54e62f95/stack/services/src/main/java/org/apache/usergrid/services/messages/MessagesService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/messages/MessagesService.java b/stack/services/src/main/java/org/apache/usergrid/services/messages/MessagesService.java
index e55c9b2..53c2475 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/messages/MessagesService.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/messages/MessagesService.java
@@ -29,8 +29,8 @@ public class MessagesService extends AbstractCollectionService {
 
     public MessagesService() {
         super();
-        if (logger.isDebugEnabled()) {
-            logger.debug("/messages");
+        if (logger.isTraceEnabled()) {
+            logger.trace("/messages");
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/usergrid/blob/54e62f95/stack/services/src/main/java/org/apache/usergrid/services/notifications/ApplicationQueueMessage.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/notifications/ApplicationQueueMessage.java b/stack/services/src/main/java/org/apache/usergrid/services/notifications/ApplicationQueueMessage.java
index 2ce381d..836bfc7 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/notifications/ApplicationQueueMessage.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/notifications/ApplicationQueueMessage.java
@@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory;
 
 public class ApplicationQueueMessage implements Serializable {
 
-    private static final Logger log = LoggerFactory.getLogger(ApplicationQueueMessage.class);
+    private static final Logger logger = LoggerFactory.getLogger(ApplicationQueueMessage.class);
     private UUID applicationId;
     private UUID notificationId;
     private UUID deviceId;

http://git-wip-us.apache.org/repos/asf/usergrid/blob/54e62f95/stack/services/src/main/java/org/apache/usergrid/services/notifications/InactiveDeviceManager.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/notifications/InactiveDeviceManager.java b/stack/services/src/main/java/org/apache/usergrid/services/notifications/InactiveDeviceManager.java
index 5ab16ba..37650c5 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/notifications/InactiveDeviceManager.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/notifications/InactiveDeviceManager.java
@@ -37,7 +37,7 @@ import java.util.Map;
  * remove inactive devices.
  */
 public class InactiveDeviceManager {
-    private static final Logger LOG = LoggerFactory.getLogger(InactiveDeviceManager.class);
+    private static final Logger logger = LoggerFactory.getLogger(InactiveDeviceManager.class);
     private final Notifier notifier;
     private EntityManager entityManager;
 
@@ -48,8 +48,8 @@ public class InactiveDeviceManager {
     public void removeInactiveDevices( Map<String,Date> inactiveDeviceMap  ){
         final String notfierPostFix = ApplicationQueueManagerImpl.NOTIFIER_ID_POSTFIX;
         if (inactiveDeviceMap != null && inactiveDeviceMap.size() > 0) {
-            if (LOG.isDebugEnabled()) {
-                LOG.debug("processing {} inactive devices", inactiveDeviceMap.size());
+            if (logger.isDebugEnabled()) {
+                logger.debug("processing {} inactive devices", inactiveDeviceMap.size());
             }
             Map<String, Object> clearPushtokenMap = new HashMap<String, Object>( 2);
             clearPushtokenMap.put(notifier.getName() + notfierPostFix,  "");
@@ -71,7 +71,7 @@ public class InactiveDeviceManager {
                         entityManager.updateProperties(e, clearPushtokenMap);
                     }
                 }catch (Exception e){
-                    LOG.error("failed to remove token",e);
+                    logger.error("failed to remove token",e);
                 }
             }
         }

http://git-wip-us.apache.org/repos/asf/usergrid/blob/54e62f95/stack/services/src/main/java/org/apache/usergrid/services/notifications/JobScheduler.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/notifications/JobScheduler.java b/stack/services/src/main/java/org/apache/usergrid/services/notifications/JobScheduler.java
index f9fe8b8..0f40d66 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/notifications/JobScheduler.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/notifications/JobScheduler.java
@@ -46,7 +46,9 @@ public class JobScheduler{
         SchedulerService scheduler = getSchedulerService();
         scheduler.createJob("notificationBatchJob", soonestPossible, jobData);
 
-        logger.info("notification {} batch scheduled for delivery", notification.getUuid());
+        if (logger.isTraceEnabled()) {
+            logger.trace("notification {} batch scheduled for delivery", notification.getUuid());
+        }
     }
     public boolean scheduleQueueJob(Notification notification) throws Exception {
         return scheduleQueueJob(notification,false);
@@ -70,7 +72,9 @@ public class JobScheduler{
             jobData.setProperty("deliver", notification.getDeliver());
             SchedulerService scheduler = getSchedulerService();
             scheduler.createJob("queueJob", scheduleAt, jobData);
-            logger.info("notification {} scheduled for queuing", notification.getUuid());
+            if (logger.isTraceEnabled()) {
+                logger.trace("notification {} scheduled for queuing", notification.getUuid());
+            }
         }
         return scheduled;
     }

http://git-wip-us.apache.org/repos/asf/usergrid/blob/54e62f95/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationsService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationsService.java b/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationsService.java
index ee4a491..bbdec7a 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationsService.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationsService.java
@@ -86,7 +86,9 @@ public class NotificationsService extends AbstractCollectionService {
     private QueueManagerFactory queueManagerFactory;
 
     public NotificationsService() {
-        logger.info("/notifications");
+        if (logger.isTraceEnabled()) {
+            logger.trace("/notifications");
+        }
     }
 
     @Override
@@ -129,7 +131,9 @@ public class NotificationsService extends AbstractCollectionService {
 
     @Override
     public ServiceResults postCollection(ServiceContext context) throws Exception {
-        logger.info("NotificationService: start request.");
+        if (logger.isTraceEnabled()) {
+            logger.trace("NotificationService: start request.");
+        }
         Timer.Context timer = postTimer.time();
         postMeter.mark();
         try {
@@ -149,12 +153,16 @@ public class NotificationsService extends AbstractCollectionService {
                 properties.put("started", notification.getStarted());
                 properties.put("state", notification.getState());
                 notification.addProperties(properties);
-                logger.info("ApplicationQueueMessage: notification {} properties updated in duration {} ms", notification.getUuid(), System.currentTimeMillis() - now);
+                if (logger.isTraceEnabled()) {
+                    logger.trace("ApplicationQueueMessage: notification {} properties updated in duration {} ms", notification.getUuid(), System.currentTimeMillis() - now);
+                }
             }
 
             long now = System.currentTimeMillis();
             notificationQueueManager.queueNotification(notification, null);
-            logger.info("NotificationService: notification {} post queue duration {} ms ", notification.getUuid(), System.currentTimeMillis() - now);
+            if (logger.isTraceEnabled()) {
+                logger.trace("NotificationService: notification {} post queue duration {} ms ", notification.getUuid(), System.currentTimeMillis() - now);
+            }
             // future: somehow return 202?
             return results;
         }catch (Exception e){

http://git-wip-us.apache.org/repos/asf/usergrid/blob/54e62f95/stack/services/src/main/java/org/apache/usergrid/services/notifications/QueueJob.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/notifications/QueueJob.java b/stack/services/src/main/java/org/apache/usergrid/services/notifications/QueueJob.java
index c6f4a17..245a36f 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/notifications/QueueJob.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/notifications/QueueJob.java
@@ -63,7 +63,9 @@ public class QueueJob extends OnlyOnceJob {
 
 
     public QueueJob() {
-        logger.info( "QueueJob created: " + this );
+        if (logger.isTraceEnabled()) {
+            logger.trace( "QueueJob created" );
+        }
     }
 
 
@@ -80,7 +82,9 @@ public class QueueJob extends OnlyOnceJob {
     public void doJob( JobExecution jobExecution ) throws Exception {
         Timer.Context timer = execution.time();
         requests.mark();
-        logger.info( "execute QueueJob {}", jobExecution );
+        if (logger.isTraceEnabled()) {
+            logger.trace("execute QueueJob {}", jobExecution);
+        }
 
         JobData jobData = jobExecution.getJobData();
         UUID applicationId = ( UUID ) jobData.getProperty( "applicationId" );
@@ -97,7 +101,9 @@ public class QueueJob extends OnlyOnceJob {
             UUID notificationId = ( UUID ) jobData.getProperty( "notificationId" );
             Notification notification = em.get( notificationId, Notification.class );
             if ( notification == null ) {
-                logger.info( "notificationId {} no longer exists", notificationId );
+                if (logger.isDebugEnabled()) {
+                    logger.trace("notificationId {} no longer exists", notificationId);
+                }
                 return;
             }
 
@@ -118,7 +124,9 @@ public class QueueJob extends OnlyOnceJob {
             timer.stop();
         }
 
-        logger.info( "execute QueueJob completed normally" );
+        if (logger.isTraceEnabled()) {
+            logger.trace("execute QueueJob completed normally");
+        }
     }
 
 

http://git-wip-us.apache.org/repos/asf/usergrid/blob/54e62f95/stack/services/src/main/java/org/apache/usergrid/services/notifications/QueueListener.java
----------------------------------------------------------------------
diff --git 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
index 6d6123c..0a0e982 100644
--- 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
@@ -92,7 +92,9 @@ public class QueueListener  {
 //        boolean shouldRun = new Boolean(properties.getProperty("usergrid.notifications.listener.run", "false"));
 
 
-            logger.info("QueueListener: starting.");
+            if (logger.isDebugEnabled()) {
+                logger.debug("QueueListener: starting.");
+            }
             int threadCount = 0;
 
             try {
@@ -112,7 +114,9 @@ public class QueueListener  {
                 pool = Executors.newFixedThreadPool(maxThreads);
 
                 while (threadCount++ < maxThreads) {
-                    logger.info("QueueListener: Starting thread {}.", threadCount);
+                    if (logger.isTraceEnabled()) {
+                        logger.trace("QueueListener: Starting thread {}.", threadCount);
+                    }
                     final int threadNumber = threadCount;
                     Runnable task = new Runnable() {
                         @Override
@@ -134,7 +138,9 @@ public class QueueListener  {
             } catch (Exception e) {
                 logger.error("QueueListener: failed to start:", e);
             }
-            logger.info("QueueListener: done starting.");
+            if (logger.isTraceEnabled()) {
+                logger.trace("QueueListener: done starting.");
+            }
     }
 
     private void execute(int threadNumber){
@@ -144,11 +150,15 @@ public class QueueListener  {
         Thread.currentThread().setName(getClass().getSimpleName()+"_PushNotifications-"+threadNumber);
 
         final AtomicInteger consecutiveExceptions = new AtomicInteger();
-        logger.info("QueueListener: Starting execute process.");
+        if (logger.isTraceEnabled()) {
+            logger.trace("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());
-        logger.info("getting from queue {} ", queueName);
+        if (logger.isTraceEnabled()) {
+            logger.trace("getting from queue {} ", queueName);
+        }
         QueueScope queueScope = new QueueScopeImpl( queueName, QueueScope.RegionImplementation.LOCAL);
         QueueManager queueManager = queueManagerFactory.getQueueManager(queueScope);
         // run until there are no more active jobs
@@ -164,7 +174,9 @@ public class QueueListener  {
                     .doOnNext(messages -> {
 
                         try {
-                            logger.info("retrieved batch of {} messages from queue {} ", messages.size(),queueName);
+                            if (logger.isTraceEnabled()) {
+                                logger.trace("retrieved batch of {} messages from queue {}", messages.size(), queueName);
+                            }
 
                             if (messages.size() > 0) {
                                 HashMap<UUID, List<QueueMessage>> messageMap = new HashMap<>(messages.size());
@@ -193,7 +205,9 @@ public class QueueListener  {
                                 for (Map.Entry<UUID, List<QueueMessage>> entry : messageMap.entrySet()) {
                                     UUID applicationId = entry.getKey();
                                     ApplicationQueueManager manager = queueManagerMap.get(applicationId);
-                                    logger.info("send batch for app {} of {} messages", entry.getKey(), entry.getValue().size());
+                                    if (logger.isTraceEnabled()) {
+                                        logger.trace("send batch for app {} of {} messages", entry.getKey(), entry.getValue().size());
+                                    }
                                     Observable current = manager.sendBatchToProviders(entry.getValue(),queueName);
 
                                     if(merge == null)
@@ -209,10 +223,14 @@ public class QueueListener  {
                                 queueManager.commitMessages(messages);
 
                                 meter.mark(messages.size());
-                                logger.info("sent batch {} messages duration {} ms", messages.size(),System.currentTimeMillis() - now);
+                                if (logger.isTraceEnabled()) {
+                                    logger.trace("sent batch {} messages duration {} ms", messages.size(), System.currentTimeMillis() - now);
+                                }
 
                                 if(sleepBetweenRuns > 0) {
-                                    logger.info("sleep between rounds...sleep...{}", sleepBetweenRuns);
+                                    if (logger.isTraceEnabled()) {
+                                        logger.trace("sleep between rounds...sleep...{}", sleepBetweenRuns);
+                                    }
                                     Thread.sleep(sleepBetweenRuns);
                                 }
 
@@ -230,7 +248,9 @@ public class QueueListener  {
                             }
 
                             else{
-                                logger.info("no messages...sleep...{}", sleepWhenNoneFound);
+                                if (logger.isTraceEnabled()) {
+                                    logger.trace("no messages...sleep...{}", sleepWhenNoneFound);
+                                }
                                 Thread.sleep(sleepWhenNoneFound);
                             }
                             timerContext.stop();
@@ -245,7 +265,9 @@ public class QueueListener  {
                                 logger.info("sleeping due to failures {} ms", sleeptime);
                                 Thread.sleep(sleeptime);
                             }catch (InterruptedException ie){
-                                logger.info("sleep interrupted");
+                                if (logger.isTraceEnabled()) {
+                                    logger.info("sleep interrupted");
+                                }
                             }
                         }
                     })
@@ -293,7 +315,9 @@ public class QueueListener  {
     }
 
     public void stop(){
-        logger.info("stop processes");
+        if (logger.isDebugEnabled()) {
+            logger.debug("stop processes");
+        }
 
         if(futures == null){
             return;

http://git-wip-us.apache.org/repos/asf/usergrid/blob/54e62f95/stack/services/src/main/java/org/apache/usergrid/services/notifications/TaskManager.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/notifications/TaskManager.java b/stack/services/src/main/java/org/apache/usergrid/services/notifications/TaskManager.java
index 6c7e53c..4f051e6 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/notifications/TaskManager.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/notifications/TaskManager.java
@@ -53,41 +53,41 @@ public class TaskManager {
         completed(notifier,null,deviceUUID,null);
     }
     public void completed(Notifier notifier, Receipt receipt, UUID deviceUUID, String newProviderId) throws Exception {
-        if (logger.isDebugEnabled()) {
-            logger.debug("REMOVED {}", deviceUUID);
+        if (logger.isTraceEnabled()) {
+            logger.trace("REMOVED {}", deviceUUID);
         }
         try {
-            if (logger.isDebugEnabled()) {
-                logger.debug("notification {} removing device {} from remaining", notification.getUuid(), deviceUUID);
+            if (logger.isTraceEnabled()) {
+                logger.trace("notification {} removing device {} from remaining", notification.getUuid(), deviceUUID);
             }
 
             EntityRef deviceRef = new SimpleEntityRef(Device.ENTITY_TYPE, deviceUUID);
             if (receipt != null) {
-                if (logger.isDebugEnabled()) {
-                    logger.debug("notification {} sent to device {}. saving receipt.", notification.getUuid(), deviceUUID);
+                if (logger.isTraceEnabled()) {
+                    logger.trace("notification {} sent to device {}. saving receipt.", notification.getUuid(), deviceUUID);
                 }
                 receipt.setSent(System.currentTimeMillis());
                 this.saveReceipt(notification, deviceRef, receipt,false);
-                if (logger.isDebugEnabled()) {
-                    logger.debug("notification {} receipt saved for device {}", notification.getUuid(), deviceUUID);
+                if (logger.isTraceEnabled()) {
+                    logger.trace("notification {} receipt saved for device {}", notification.getUuid(), deviceUUID);
                 }
                 successes.incrementAndGet();
             }
 
             if (newProviderId != null) {
-                if (logger.isDebugEnabled()) {
-                    logger.debug("notification {} replacing device {} notifierId", notification.getUuid(), deviceUUID);
+                if (logger.isTraceEnabled()) {
+                    logger.trace("notification {} replacing device {} notifierId", notification.getUuid(), deviceUUID);
                 }
                 replaceProviderId(deviceRef, notifier, newProviderId);
             }
 
-            if (logger.isDebugEnabled()) {
-                logger.debug("notification {} completed device {}", notification.getUuid(), deviceUUID);
+            if (logger.isTraceEnabled()) {
+                logger.trace("notification {} completed device {}", notification.getUuid(), deviceUUID);
             }
 
         } finally {
-            if (logger.isDebugEnabled()) {
-                logger.debug("COUNT is: {}", successes.get());
+            if (logger.isTraceEnabled()) {
+                logger.trace("COUNT is: {}", successes.get());
             }
             if (hasFinished) { //process has finished but notifications are still coming in
                 finishedBatch();
@@ -100,11 +100,7 @@ public class TaskManager {
 
         try {
             if (logger.isDebugEnabled()) {
-                StringBuilder sb = new StringBuilder();
-                sb.append("notification ").append(notification.getUuid());
-                sb.append(" for device ").append(deviceUUID);
-                sb.append(" got error ").append(code);
-                logger.debug(sb.toString());
+                logger.debug("notification {} for device {} got error {}", notification.getUuid(), deviceUUID, code);
             }
 
             failures.incrementAndGet();
@@ -194,7 +190,7 @@ public class TaskManager {
             notification.addProperties(properties);
 
             long latency = notification.getFinished() - notification.getStarted();
-            logger.info("notification finished batch: {} of {} devices in " + latency + "ms", notification.getUuid(), totals);
+            logger.info("notification finished batch: {} of {} devices in {} ms", notification.getUuid(), totals, latency);
 
             em.update(notification);
 //        Set<Notifier> notifiers = new HashSet<>(proxy.getAdapterMap().values()); // remove dups

http://git-wip-us.apache.org/repos/asf/usergrid/blob/54e62f95/stack/services/src/main/java/org/apache/usergrid/services/notifications/apns/APNsAdapter.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/notifications/apns/APNsAdapter.java b/stack/services/src/main/java/org/apache/usergrid/services/notifications/apns/APNsAdapter.java
index 3549777..3d4911d 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/notifications/apns/APNsAdapter.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/notifications/apns/APNsAdapter.java
@@ -139,9 +139,7 @@ public class APNsAdapter implements ProviderAdapter {
                     pushManager.start();
                 }
             } catch (IllegalStateException ise) {
-                if (logger.isDebugEnabled()) {
-                    logger.debug("failed to start", ise);//could have failed because its started
-                }
+                logger.warn("getPushManager: failed to start", ise);//could have failed because its started
             }
         }
         return pushManager;

http://git-wip-us.apache.org/repos/asf/usergrid/blob/54e62f95/stack/services/src/main/java/org/apache/usergrid/services/notifications/apns/RejectedAPNsListener.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/notifications/apns/RejectedAPNsListener.java b/stack/services/src/main/java/org/apache/usergrid/services/notifications/apns/RejectedAPNsListener.java
index 545dc0c..dc842e7 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/notifications/apns/RejectedAPNsListener.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/notifications/apns/RejectedAPNsListener.java
@@ -28,6 +28,8 @@ import org.slf4j.LoggerFactory;
  */
 public class RejectedAPNsListener implements RejectedNotificationListener<SimpleApnsPushNotification>{
 
+    private static final Logger logger = LoggerFactory.getLogger(RejectedAPNsListener.class);
+
     @Override
     public void handleRejectedNotification(PushManager<? extends SimpleApnsPushNotification> pushManager, SimpleApnsPushNotification notification, RejectedNotificationReason rejectionReason) {
         try {
@@ -48,6 +50,4 @@ public class RejectedAPNsListener implements RejectedNotificationListener<Simple
         }
         System.out.format("%s was rejected with rejection reason %s\n", notification, rejectionReason);
     }
-
-    private static final Logger logger = LoggerFactory.getLogger(RejectedAPNsListener.class);
 }

http://git-wip-us.apache.org/repos/asf/usergrid/blob/54e62f95/stack/services/src/main/java/org/apache/usergrid/services/notifications/gcm/GCMAdapter.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/notifications/gcm/GCMAdapter.java b/stack/services/src/main/java/org/apache/usergrid/services/notifications/gcm/GCMAdapter.java
index 18c193f..f267fab 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/notifications/gcm/GCMAdapter.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/notifications/gcm/GCMAdapter.java
@@ -39,7 +39,7 @@ import java.util.concurrent.ConcurrentHashMap;
 
 public class GCMAdapter implements ProviderAdapter {
 
-    private static final Logger LOG = LoggerFactory.getLogger(GCMAdapter.class);
+    private static final Logger logger = LoggerFactory.getLogger(GCMAdapter.class);
     private static final int SEND_RETRIES = 3;
     private static int BATCH_SIZE = 1000;
     private final Notifier notifier;
@@ -65,10 +65,14 @@ public class GCMAdapter implements ProviderAdapter {
         ids.add("device_token");
         try {
             MulticastResult result = sender.send(message, ids, 1);
-            LOG.debug("testConnection result: {}", result);
+            if (logger.isTraceEnabled()) {
+                logger.trace("testConnection result: {}", result);
+            }
         } catch (InvalidRequestException e){
             // do nothing, we don't have a valid device token to test with
-            LOG.debug("here for testing only");
+            if (logger.isTraceEnabled()) {
+                logger.trace("no valid device token");
+            }
         }
         catch (IOException e) {
             if(isInvalidRequestException(e)){
@@ -164,7 +168,7 @@ public class GCMAdapter implements ProviderAdapter {
                 }
             }
         }catch (Exception e){
-            LOG.error("error while trying to send on stop",e);
+            logger.error("error while trying to send on stop",e);
         }
     }
 
@@ -265,7 +269,9 @@ public class GCMAdapter implements ProviderAdapter {
                 }
 
 
-                LOG.debug("sendNotification result: {}", multicastResult);
+                if (logger.isTraceEnabled()) {
+                    logger.trace("sendNotification result: {}", multicastResult);
+                }
 
                 for (int i = 0; i < multicastResult.getResults().size(); i++) {
                     Result result = multicastResult.getResults().get(i);

http://git-wip-us.apache.org/repos/asf/usergrid/blob/54e62f95/stack/services/src/main/java/org/apache/usergrid/services/notifications/impl/ApplicationQueueManagerImpl.java
----------------------------------------------------------------------
diff --git 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
index 22b7d51..42ef433 100644
--- 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
@@ -83,14 +83,18 @@ public class ApplicationQueueManagerImpl implements ApplicationQueueManager {
         long startTime = System.currentTimeMillis();
 
         if (notification.getCanceled() == Boolean.TRUE) {
-            logger.info("notification " + notification.getUuid() + " canceled");
+            if (logger.isDebugEnabled()) {
+                logger.debug("notification " + notification.getUuid() + " canceled");
+            }
             if (jobExecution != null) {
                 jobExecution.killed();
             }
             return;
         }
 
-        logger.info("notification {} start queuing", notification.getUuid());
+        if (logger.isTraceEnabled()) {
+            logger.trace("notification {} start queuing", notification.getUuid());
+        }
 
         final PathQuery<Device> pathQuery = notification.getPathQuery().buildPathQuery() ; //devices query
         final AtomicInteger deviceCount = new AtomicInteger(); //count devices so you can make a judgement on batching
@@ -100,7 +104,9 @@ public class ApplicationQueueManagerImpl implements ApplicationQueueManager {
         //get devices in querystring, and make sure you have access
         if (pathQuery != null) {
             final HashMap<Object,ProviderAdapter> notifierMap =  getAdapterMap();
-            logger.info("notification {} start query", notification.getUuid());
+            if (logger.isTraceEnabled()) {
+                logger.trace("notification {} start query", notification.getUuid());
+            }
             final Iterator<Device> iterator = pathQuery.iterator(em);
             //if there are more pages (defined by PAGE_SIZE) you probably want this to be async, also if this is already a job then don't reschedule
             if (iterator instanceof ResultsIterator && ((ResultsIterator) iterator).hasPages() && jobExecution == null) {
@@ -119,13 +125,19 @@ public class ApplicationQueueManagerImpl implements ApplicationQueueManager {
                     long now = System.currentTimeMillis();
                     List<EntityRef> devicesRef = getDevices(entity); // resolve group
 
-                    logger.info("notification {} queue  {} devices, duration "+(System.currentTimeMillis()-now)+" ms", notification.getUuid(), devicesRef.size());
+                    if (logger.isTraceEnabled()) {
+                        logger.trace("notification {} queue  {} devices, duration {} ms", notification.getUuid(), devicesRef.size(), (System.currentTimeMillis() - now));
+                    }
 
                     for (EntityRef deviceRef : devicesRef) {
-                        logger.info("notification {} starting to queue device {} ", notification.getUuid(), deviceRef.getUuid());
+                        if (logger.isTraceEnabled()) {
+                            logger.trace("notification {} starting to queue device {} ", notification.getUuid(), deviceRef.getUuid());
+                        }
                         long hash = MurmurHash.hash(deviceRef.getUuid());
                         if (sketch.estimateCount(hash) > 0) { //look for duplicates
-                            logger.warn("Maybe Found duplicate device: {}", deviceRef.getUuid());
+                            if (logger.isDebugEnabled()) {
+                                logger.debug("Maybe Found duplicate device: {}", deviceRef.getUuid());
+                            }
                             continue;
                         } else {
                             sketch.add(hash, 1);
@@ -143,7 +155,9 @@ public class ApplicationQueueManagerImpl implements ApplicationQueueManager {
                                 notifierKey = entry.getKey().toLowerCase();
                                 break;
                             }
-                            logger.info("Provider query for notification {} device {} took "+(System.currentTimeMillis()-now)+" ms",notification.getUuid(),deviceRef.getUuid());
+                            if (logger.isTraceEnabled()) {
+                                logger.trace("Provider query for notification {} device {} took {} ms", notification.getUuid(), deviceRef.getUuid(), (System.currentTimeMillis() - now));
+                            }
                         }
 
                         if (notifierId == null) {
@@ -156,11 +170,15 @@ public class ApplicationQueueManagerImpl implements ApplicationQueueManager {
                             // update queued time
                             now = System.currentTimeMillis();
                             notification.setQueued(System.currentTimeMillis());
-                            logger.info("notification {} device {} queue time set. duration "+(System.currentTimeMillis()-now)+" ms", notification.getUuid(), deviceRef.getUuid());
+                            if (logger.isTraceEnabled()) {
+                                logger.trace("notification {} device {} queue time set. duration {} ms", notification.getUuid(), deviceRef.getUuid(), (System.currentTimeMillis() - now));
+                            }
                         }
                         now = System.currentTimeMillis();
                         qm.sendMessage(message);
-                        logger.info("notification {} post-queue to device {} duration " + (System.currentTimeMillis() - now) + " ms "+queueName+" queue", notification.getUuid(), deviceRef.getUuid());
+                        if (logger.isTraceEnabled()) {
+                            logger.trace("notification {} post-queue to device {} duration {} ms, {} queue", notification.getUuid(), deviceRef.getUuid(), (System.currentTimeMillis() - now), queueName);
+                        }
                         deviceCount.incrementAndGet();
                         queueMeter.mark();
                     }
@@ -185,11 +203,13 @@ public class ApplicationQueueManagerImpl implements ApplicationQueueManager {
                                             , 10);
 
             o.toBlocking().lastOrDefault( null );
-            logger.info( "notification {} done queueing duration {} ms", notification.getUuid(), System.currentTimeMillis() - now);
+            if (logger.isTraceEnabled()) {
+                logger.trace("notification {} done queueing duration {} ms", notification.getUuid(), System.currentTimeMillis() - now);
+            }
         }
 
         // update queued time
-        Map<String, Object> properties = new HashMap<String, Object>(2);
+        Map<String, Object> properties = new HashMap<>(2);
         properties.put("queued", notification.getQueued());
         properties.put("state", notification.getState());
         if(errorMessages.size()>0){
@@ -215,7 +235,9 @@ public class ApplicationQueueManagerImpl implements ApplicationQueueManager {
         }
 
         long elapsed = notification.getQueued() != null ? notification.getQueued() - startTime : 0;
-        logger.info("notification {} done queuing to {} devices in " + elapsed + " ms", notification.getUuid().toString(), deviceCount.get());
+        if (logger.isTraceEnabled()) {
+            logger.trace("notification {} done queuing to {} devices in {} ms", notification.getUuid().toString(), deviceCount.get(), elapsed);
+        }
     }
 
     /**
@@ -260,7 +282,9 @@ public class ApplicationQueueManagerImpl implements ApplicationQueueManager {
      */
     @Override
     public Observable sendBatchToProviders(final List<QueueMessage> messages, final String queuePath) {
-        logger.info("sending batch of {} notifications.", messages.size());
+        if (logger.isTraceEnabled()) {
+            logger.trace("sending batch of {} notifications.", messages.size());
+        }
 
         final Map<Object, ProviderAdapter> notifierMap = getAdapterMap();
         final ApplicationQueueManagerImpl proxy = this;
@@ -274,7 +298,9 @@ public class ApplicationQueueManagerImpl implements ApplicationQueueManager {
                 ApplicationQueueMessage message = null;
                 try {
                     message = (ApplicationQueueMessage) queueMessage.getBody();
-                    logger.info("start sending notification for device {} for Notification: {} on thread "+Thread.currentThread().getId(), message.getDeviceId(), message.getNotificationId());
+                    if (logger.isTraceEnabled()) {
+                        logger.trace("start sending notification for device {} for Notification: {} on thread {}", message.getDeviceId(), message.getNotificationId(), Thread.currentThread().getId());
+                    }
 
                     UUID deviceUUID = message.getDeviceId();
 
@@ -292,7 +318,9 @@ public class ApplicationQueueManagerImpl implements ApplicationQueueManager {
 
                     final Map<String, Object> payloads = notification.getPayloads();
                     final Map<String, Object> translatedPayloads = translatePayloads(payloads, notifierMap);
-                    logger.info("sending notification for device {} for Notification: {}", deviceUUID, notification.getUuid());
+                    if (logger.isTraceEnabled()) {
+                        logger.trace("sending notification for device {} for Notification: {}", deviceUUID, notification.getUuid());
+                    }
 
                     try {
                         String notifierName = message.getNotifierKey().toLowerCase();
@@ -315,7 +343,9 @@ public class ApplicationQueueManagerImpl implements ApplicationQueueManager {
                                 } catch (Exception e) {
                                     tracker.failed(0, e.getMessage());
                                 } finally {
-                                    logger.info("sending to device {} for Notification: {} duration " + (System.currentTimeMillis() - now) + " ms", deviceUUID, notification.getUuid());
+                                    if (logger.isTraceEnabled()) {
+                                        logger.trace("sending to device {} for Notification: {} duration {} ms", deviceUUID, notification.getUuid(), (System.currentTimeMillis() - now));
+                                    }
                                 }
                             }
                         }
@@ -448,13 +478,13 @@ public class ApplicationQueueManagerImpl implements ApplicationQueueManager {
         for (final ProviderAdapter providerAdapter : providerAdapters) {
             try {
                 if (providerAdapter != null) {
-                    if (logger.isDebugEnabled()) {
-                        logger.debug("checking notifier {} for inactive devices", providerAdapter.getNotifier());
+                    if (logger.isTraceEnabled()) {
+                        logger.trace("checking notifier {} for inactive devices", providerAdapter.getNotifier());
                     }
                     providerAdapter.removeInactiveDevices();
 
-                    if (logger.isDebugEnabled()) {
-                        logger.debug("finished checking notifier {} for inactive devices", providerAdapter.getNotifier());
+                    if (logger.isTraceEnabled()) {
+                        logger.trace("finished checking notifier {} for inactive devices", providerAdapter.getNotifier());
                     }
                 }
             } catch (Exception e) {
@@ -470,18 +500,24 @@ public class ApplicationQueueManagerImpl implements ApplicationQueueManager {
     private boolean isOkToSend(Notification notification) {
         Map<String,Long> stats = notification.getStatistics();
         if (stats != null && notification.getExpectedCount() == (stats.get("sent")+ stats.get("errors"))) {
-            logger.info("notification {} already processed. not sending.",
-                    notification.getUuid());
+            if (logger.isDebugEnabled()) {
+                logger.debug("notification {} already processed. not sending.",
+                        notification.getUuid());
+            }
             return false;
         }
         if (notification.getCanceled() == Boolean.TRUE) {
-            logger.info("notification {} canceled. not sending.",
-                    notification.getUuid());
+            if (logger.isDebugEnabled()) {
+                logger.debug("notification {} canceled. not sending.",
+                        notification.getUuid());
+            }
             return false;
         }
         if (notification.isExpired()) {
-            logger.info("notification {} expired. not sending.",
-                    notification.getUuid());
+            if (logger.isDebugEnabled()) {
+                logger.debug("notification {} expired. not sending.",
+                        notification.getUuid());
+            }
             return false;
         }
         return true;

http://git-wip-us.apache.org/repos/asf/usergrid/blob/54e62f95/stack/services/src/main/java/org/apache/usergrid/services/notifiers/NotifiersService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/notifiers/NotifiersService.java b/stack/services/src/main/java/org/apache/usergrid/services/notifiers/NotifiersService.java
index 3e9ca3e..54a9dc4 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/notifiers/NotifiersService.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/notifiers/NotifiersService.java
@@ -32,7 +32,9 @@ public class NotifiersService extends AbstractCollectionService {
 
     public NotifiersService() {
         super();
-        logger.info("/notifiers");
+        if (logger.isTraceEnabled()) {
+            logger.trace("/notifiers");
+        }
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/usergrid/blob/54e62f95/stack/services/src/main/java/org/apache/usergrid/services/queues/ImportQueueListener.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/queues/ImportQueueListener.java b/stack/services/src/main/java/org/apache/usergrid/services/queues/ImportQueueListener.java
index 975b368..a95475d 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/queues/ImportQueueListener.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/queues/ImportQueueListener.java
@@ -73,8 +73,8 @@ public class ImportQueueListener extends QueueListener {
          * of the message and typecast it into a model called ApplicationQueueMessage.  Then it does
          * work on the message.
          */
-        if (logger.isDebugEnabled()) {
-            logger.debug("Doing work in onMessage in ImportQueueListener");
+        if (logger.isTraceEnabled()) {
+            logger.trace("Doing work in onMessage in ImportQueueListener");
         }
         for (QueueMessage message : messages) {
             ImportQueueMessage queueMessage = ( ImportQueueMessage ) message.getBody();

http://git-wip-us.apache.org/repos/asf/usergrid/blob/54e62f95/stack/services/src/main/java/org/apache/usergrid/services/queues/QueueListener.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/queues/QueueListener.java b/stack/services/src/main/java/org/apache/usergrid/services/queues/QueueListener.java
index bafa3a2..7ceb2ae 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/queues/QueueListener.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/queues/QueueListener.java
@@ -102,7 +102,9 @@ public abstract class QueueListener  {
         boolean shouldRun = new Boolean(properties.getProperty("usergrid.queues.listener.run", "true"));
 
         if(shouldRun) {
-            logger.info("QueueListener: starting.");
+            if (logger.isTraceEnabled()) {
+                logger.trace("QueueListener: starting.");
+            }
             int threadCount = 0;
 
             try {
@@ -121,14 +123,16 @@ public abstract class QueueListener  {
                 pool = Executors.newFixedThreadPool(maxThreads);
 
                 while (threadCount++ < maxThreads) {
-                    logger.info("QueueListener: Starting thread {}.", threadCount);
+                    if (logger.isTraceEnabled()) {
+                        logger.trace("QueueListener: Starting thread {}.", threadCount);
+                    }
                     Runnable task = new Runnable() {
                         @Override
                         public void run() {
                             try {
                                 execute();
                             } catch (Exception e) {
-                                logger.error("failed to start push", e);
+                                logger.warn("failed to start push", e);
                             }
                         }
                     };
@@ -137,7 +141,9 @@ public abstract class QueueListener  {
             } catch (Exception e) {
                 logger.error("QueueListener: failed to start:", e);
             }
-            logger.info("QueueListener: done starting.");
+            if (logger.isTraceEnabled()) {
+                logger.trace("QueueListener: done starting.");
+            }
         }else{
             logger.info("QueueListener: never started due to config value usergrid.queues.listener.run.");
         }
@@ -156,9 +162,13 @@ public abstract class QueueListener  {
         Thread.currentThread().setName("queues_Processor"+UUID.randomUUID());
 
         final AtomicInteger consecutiveExceptions = new AtomicInteger();
-        logger.info("QueueListener: Starting execute process.");
+        if (logger.isTraceEnabled()) {
+            logger.trace("QueueListener: Starting execute process.");
+        }
         svcMgr = smf.getServiceManager(smf.getManagementAppId());
-        logger.info("getting from queue {} ", queueName);
+        if (logger.isTraceEnabled()) {
+            logger.trace("getting from queue {} ", queueName);
+        }
         QueueScope queueScope = new QueueScopeImpl( queueName, QueueScope.RegionImplementation.LOCAL);
         QueueManager queueManager = queueManagerFactory.getQueueManager(queueScope);
         // run until there are no more active jobs
@@ -175,7 +185,9 @@ public abstract class QueueListener  {
                     .buffer(getBatchSize())
                     .doOnNext(messages -> {
                         try {
-                            logger.info("retrieved batch of {} messages from queue {} ", messages.size(), queueName);
+                            if (logger.isTraceEnabled()) {
+                                logger.trace("retrieved batch of {} messages from queue {} ", messages.size(), queueName);
+                            }
 
                             if (messages.size() > 0) {
 
@@ -188,15 +200,21 @@ public abstract class QueueListener  {
                                 queueManager.commitMessages(messages);
 
                                 meter.mark(messages.size());
-                                logger.info("sent batch {} messages duration {} ms", messages.size(), System.currentTimeMillis() - now);
+                                if (logger.isTraceEnabled()) {
+                                    logger.trace("sent batch {} messages duration {} ms", messages.size(), System.currentTimeMillis() - now);
+                                }
 
                                 if (sleepBetweenRuns > 0) {
-                                    logger.info("sleep between rounds...sleep...{}", sleepBetweenRuns);
+                                    if (logger.isTraceEnabled()) {
+                                        logger.trace("sleep between rounds...sleep...{}", sleepBetweenRuns);
+                                    }
                                     Thread.sleep(sleepBetweenRuns);
                                 }
 
                             } else {
-                                logger.info("no messages...sleep...{}", sleepWhenNoneFound);
+                                if (logger.isTraceEnabled()) {
+                                    logger.trace("no messages...sleep...{}", sleepWhenNoneFound);
+                                }
                                 Thread.sleep(sleepWhenNoneFound);
                             }
                             timerContext.stop();
@@ -208,10 +226,14 @@ public abstract class QueueListener  {
                                 long sleeptime = sleepWhenNoneFound * consecutiveExceptions.incrementAndGet();
                                 long maxSleep = 15000;
                                 sleeptime = sleeptime > maxSleep ? maxSleep : sleeptime;
-                                logger.info("sleeping due to failures {} ms", sleeptime);
+                                if (logger.isTraceEnabled()) {
+                                    logger.trace("sleeping due to failures {} ms", sleeptime);
+                                }
                                 Thread.sleep(sleeptime);
                             } catch (InterruptedException ie) {
-                                logger.info("sleep interrupted");
+                                if (logger.isTraceEnabled()) {
+                                    logger.trace("sleep interrupted");
+                                }
                             }
                         }
                     }).toBlocking().lastOrDefault(null);
@@ -220,7 +242,9 @@ public abstract class QueueListener  {
 
 
     public void stop(){
-        logger.info("stop processes");
+        if (logger.isTraceEnabled()) {
+            logger.trace("stop processes");
+        }
 
         if(futures == null){
             return;

http://git-wip-us.apache.org/repos/asf/usergrid/blob/54e62f95/stack/services/src/main/java/org/apache/usergrid/services/roles/RolesService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/roles/RolesService.java b/stack/services/src/main/java/org/apache/usergrid/services/roles/RolesService.java
index ff36450..09209cc 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/roles/RolesService.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/roles/RolesService.java
@@ -44,8 +44,8 @@ public class RolesService extends AbstractCollectionService {
 
     public RolesService() {
         super();
-        if (logger.isDebugEnabled()) {
-            logger.debug("/roles");
+        if (logger.isTraceEnabled()) {
+            logger.trace("/roles");
         }
 
         declareEntityDictionary( "permissions" );

http://git-wip-us.apache.org/repos/asf/usergrid/blob/54e62f95/stack/services/src/main/java/org/apache/usergrid/services/roles/groups/GroupsService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/roles/groups/GroupsService.java b/stack/services/src/main/java/org/apache/usergrid/services/roles/groups/GroupsService.java
index 9bf89ee..be1f1c0 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/roles/groups/GroupsService.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/roles/groups/GroupsService.java
@@ -28,8 +28,8 @@ public class GroupsService extends org.apache.usergrid.services.groups.GroupsSer
 
     public GroupsService() {
         super();
-        if (logger.isDebugEnabled()) {
-            logger.debug("/roles/*/groups");
+        if (logger.isTraceEnabled()) {
+            logger.trace("/roles/*/groups");
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/usergrid/blob/54e62f95/stack/services/src/main/java/org/apache/usergrid/services/roles/users/UsersService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/roles/users/UsersService.java b/stack/services/src/main/java/org/apache/usergrid/services/roles/users/UsersService.java
index 8ee733d..378a58e 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/roles/users/UsersService.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/roles/users/UsersService.java
@@ -36,8 +36,8 @@ public class UsersService extends org.apache.usergrid.services.users.UsersServic
 
     public UsersService() {
         super();
-        if (logger.isDebugEnabled()) {
-            logger.debug("/roles/*/users");
+        if (logger.isTraceEnabled()) {
+            logger.trace("/roles/*/users");
         }
     }
 

http://git-wip-us.apache.org/repos/asf/usergrid/blob/54e62f95/stack/services/src/main/java/org/apache/usergrid/services/users/UsersService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/users/UsersService.java b/stack/services/src/main/java/org/apache/usergrid/services/users/UsersService.java
index 4a5ca68..3092a0e 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/users/UsersService.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/users/UsersService.java
@@ -55,13 +55,13 @@ import static org.apache.usergrid.utils.ConversionUtils.string;
 
 public class UsersService extends AbstractCollectionService {
 
-    private static final Logger LOG = LoggerFactory.getLogger( UsersService.class );
+    private static final Logger logger = LoggerFactory.getLogger( UsersService.class );
 
 
     public UsersService() {
         super();
-        if (LOG.isDebugEnabled()) {
-            LOG.debug("/users");
+        if (logger.isTraceEnabled()) {
+            logger.trace("/users");
         }
 
         makeConnectionPrivate( "following" );

http://git-wip-us.apache.org/repos/asf/usergrid/blob/54e62f95/stack/services/src/main/java/org/apache/usergrid/services/users/activities/ActivitiesService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/users/activities/ActivitiesService.java b/stack/services/src/main/java/org/apache/usergrid/services/users/activities/ActivitiesService.java
index 0961708..b97c1ee 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/users/activities/ActivitiesService.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/users/activities/ActivitiesService.java
@@ -39,8 +39,8 @@ public class ActivitiesService extends GenericCollectionService {
 
     public ActivitiesService() {
         super();
-        if (logger.isDebugEnabled()) {
-            logger.debug("/users/*/activities");
+        if (logger.isTraceEnabled()) {
+            logger.trace("/users/*/activities");
         }
     }
 

http://git-wip-us.apache.org/repos/asf/usergrid/blob/54e62f95/stack/services/src/main/java/org/apache/usergrid/services/users/devices/DevicesService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/users/devices/DevicesService.java b/stack/services/src/main/java/org/apache/usergrid/services/users/devices/DevicesService.java
index 8e7ba3b..84009fd 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/users/devices/DevicesService.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/users/devices/DevicesService.java
@@ -34,28 +34,28 @@ public class DevicesService extends org.apache.usergrid.services.devices.Devices
 
     public DevicesService() {
         super();
-        if (logger.isDebugEnabled()) {
-            logger.debug("/users/*/devices");
+        if (logger.isTraceEnabled()) {
+            logger.trace("/users/*/devices");
         }
     }
 
     @Override
     public ServiceResults putItemById( ServiceContext context, UUID id ) throws Exception {
-        if (logger.isDebugEnabled()) {
-            logger.debug("Registering device {}", id);
+        if (logger.isTraceEnabled()) {
+            logger.trace("Registering device {}", id);
         }
         unregisterDeviceToUsers(id,context.getOwner());
-        ServiceResults results = super.putItemById( context, id );
-        return results;
+        return super.putItemById( context, id );
     }
 
 
     @Override
     public ServiceResults postItemById( ServiceContext context, UUID id ) throws Exception {
-        logger.info( "Attempting to connect an entity to device {}", id );
+        if (logger.isTraceEnabled()) {
+            logger.trace("Attempting to connect an entity to device {}", id);
+        }
         unregisterDeviceToUsers(id,context.getOwner());
-        ServiceResults results = super.postItemById( context, id );
-        return results;
+        return super.postItemById( context, id );
     }
 
     protected void unregisterDeviceToUsers(UUID deviceId, EntityRef owner){
@@ -63,7 +63,7 @@ public class DevicesService extends org.apache.usergrid.services.devices.Devices
             EntityRef device = new SimpleEntityRef("device",deviceId);
             deleteEntityConnection(device,owner);
         } catch (Exception e) {
-            logger.error("Failed to delete connection for " + deviceId.toString(), e);
+            logger.error("Failed to delete connection for {}", deviceId.toString(), e);
         }
 
     }

http://git-wip-us.apache.org/repos/asf/usergrid/blob/54e62f95/stack/services/src/main/java/org/apache/usergrid/services/users/devices/notifications/NotificationsService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/users/devices/notifications/NotificationsService.java b/stack/services/src/main/java/org/apache/usergrid/services/users/devices/notifications/NotificationsService.java
index 79972c6..b85b86f 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/users/devices/notifications/NotificationsService.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/users/devices/notifications/NotificationsService.java
@@ -26,7 +26,9 @@ public class NotificationsService extends
             .getLogger(NotificationsService.class);
 
     public NotificationsService() {
-        logger.info("/users/*/devices/*/notifications");
+        if (logger.isTraceEnabled()) {
+            logger.trace("/users/*/devices/*/notifications");
+        }
     }
 
 }

http://git-wip-us.apache.org/repos/asf/usergrid/blob/54e62f95/stack/services/src/main/java/org/apache/usergrid/services/users/following/FollowingService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/users/following/FollowingService.java b/stack/services/src/main/java/org/apache/usergrid/services/users/following/FollowingService.java
index 7c900bc..b14f129 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/users/following/FollowingService.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/users/following/FollowingService.java
@@ -46,7 +46,9 @@ public class FollowingService extends AbstractConnectionsService {
 
     public void copyActivityFeed( final EntityRef connectingEntity, final EntityRef connectedEntityRef )
             throws Exception {
-        logger.info( "Copying activities to feed..." );
+        if (logger.isTraceEnabled()) {
+            logger.trace("Copying activities to feed...");
+        }
         TaskExecutor taskExecutor = ( TaskExecutor ) getApplicationContext().getBean( "taskExecutor" );
         taskExecutor.execute( new Runnable() {
             @Override

http://git-wip-us.apache.org/repos/asf/usergrid/blob/54e62f95/stack/services/src/main/java/org/apache/usergrid/services/users/groups/GroupsService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/users/groups/GroupsService.java b/stack/services/src/main/java/org/apache/usergrid/services/users/groups/GroupsService.java
index d825d6a..4fceacc 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/users/groups/GroupsService.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/users/groups/GroupsService.java
@@ -28,8 +28,8 @@ public class GroupsService extends org.apache.usergrid.services.groups.GroupsSer
 
     public GroupsService() {
         super();
-        if (logger.isDebugEnabled()) {
-            logger.debug("/users/*/groups");
+        if (logger.isTraceEnabled()) {
+            logger.trace("/users/*/groups");
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/usergrid/blob/54e62f95/stack/services/src/main/java/org/apache/usergrid/services/users/notifications/NotificationsService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/users/notifications/NotificationsService.java b/stack/services/src/main/java/org/apache/usergrid/services/users/notifications/NotificationsService.java
index 4b536bc..f4ce7e2 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/users/notifications/NotificationsService.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/users/notifications/NotificationsService.java
@@ -26,7 +26,9 @@ public class NotificationsService extends
             .getLogger(NotificationsService.class);
 
     public NotificationsService() {
-        logger.info("/users/*/notifications");
+        if (logger.isTraceEnabled()) {
+            logger.trace("/users/*/notifications");
+        }
     }
 
 }

http://git-wip-us.apache.org/repos/asf/usergrid/blob/54e62f95/stack/services/src/main/java/org/apache/usergrid/services/users/roles/RolesService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/users/roles/RolesService.java b/stack/services/src/main/java/org/apache/usergrid/services/users/roles/RolesService.java
index 6da58bf..1f7637f 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/users/roles/RolesService.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/users/roles/RolesService.java
@@ -38,7 +38,9 @@ public class RolesService extends org.apache.usergrid.services.roles.RolesServic
 
     public RolesService() {
         super();
-        logger.info( "/users/*/roles" );
+        if (logger.isTraceEnabled()) {
+            logger.trace("/users/*/roles");
+        }
     }
 
 

http://git-wip-us.apache.org/repos/asf/usergrid/blob/54e62f95/stack/services/src/main/java/org/apache/usergrid/utils/PythonUtils.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/utils/PythonUtils.java b/stack/services/src/main/java/org/apache/usergrid/utils/PythonUtils.java
index 99d0da5..773b05c 100644
--- a/stack/services/src/main/java/org/apache/usergrid/utils/PythonUtils.java
+++ b/stack/services/src/main/java/org/apache/usergrid/utils/PythonUtils.java
@@ -39,7 +39,7 @@ public class PythonUtils {
             pyObject = interpreter.get( clsName );
         }
         catch ( Exception e ) {
-            logger.error( "The Python module '" + moduleName + "' is not found: " + compactWhitespace( e.toString() ) );
+            logger.error( "The Python module '{}' is not found: {}", moduleName, compactWhitespace( e.toString() ) );
         }
         return pyObject;
     }
@@ -71,7 +71,7 @@ public class PythonUtils {
                     interfaceType.toString().indexOf( " " ) + 1, interfaceType.toString().length() ) ) );
         }
         catch ( Exception ex ) {
-            logger.error( "Unable to create Python object: " + compactWhitespace( ex.toString() ) );
+            logger.error( "Unable to create Python object: {}", compactWhitespace( ex.toString() ) );
         }
 
         return javaObj;

http://git-wip-us.apache.org/repos/asf/usergrid/blob/54e62f95/stack/test-utils/src/main/java/org/apache/usergrid/cassandra/CassandraResource.java
----------------------------------------------------------------------
diff --git a/stack/test-utils/src/main/java/org/apache/usergrid/cassandra/CassandraResource.java b/stack/test-utils/src/main/java/org/apache/usergrid/cassandra/CassandraResource.java
index a87af41..34ddc55 100644
--- a/stack/test-utils/src/main/java/org/apache/usergrid/cassandra/CassandraResource.java
+++ b/stack/test-utils/src/main/java/org/apache/usergrid/cassandra/CassandraResource.java
@@ -108,7 +108,7 @@ public class CassandraResource extends EnvironResource {
 
             System.setProperty( "cassandra." + RPC_PORT_KEY, Integer.toString( port ) );
 
-            logger.info( "project.properties loaded properties for ports : " + "[rpc] = [{}]", new Object[] { port } );
+            logger.info( "project.properties loaded properties for ports : [rpc] = [{}]", port );
 
 
             initialized = true;


Mime
View raw message