usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [27/50] [abbrv] usergrid git commit: USERGRID-1243: logging overhaul, pt. 1
Date Thu, 04 Feb 2016 17:57:51 GMT
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/CounterUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/CounterUtils.java b/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/CounterUtils.java
index 032836f..0e55dc9 100644
--- a/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/CounterUtils.java
+++ b/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/CounterUtils.java
@@ -224,15 +224,15 @@ public class CounterUtils {
                                                  UUID queueId, String category, String name, long value,
                                                  long counterTimestamp, long cassandraTimestamp ) {
         for ( CounterResolution resolution : CounterResolution.values() ) {
-            if (logger.isDebugEnabled()) {
-                logger.debug("BIAC for resolution {}", resolution);
+            if (logger.isTraceEnabled()) {
+                logger.trace("BIAC for resolution {}", resolution);
             }
 
             batchIncrementAggregateCounters( m, userId, groupId, queueId, category, resolution, name, value,
                     counterTimestamp, applicationId );
 
-            if (logger.isDebugEnabled()) {
-                logger.debug("DONE BIAC for resolution {}", resolution);
+            if (logger.isTraceEnabled()) {
+                logger.trace("DONE BIAC for resolution {}", resolution);
             }
         }
         batchIncrementEntityCounter( m, applicationId, name, value, cassandraTimestamp, applicationId );
@@ -296,9 +296,9 @@ public class CounterUtils {
 
     private void handleAggregateCounterRow( Mutator<ByteBuffer> m, String key, long column, long value,
                                             UUID applicationId ) {
-        if ( logger.isDebugEnabled() ) {
-            logger.info( "HACR: aggregateRow for app {} with key {} column {} and value {}",
-                    new Object[] { applicationId, key, column, value } );
+        if ( logger.isTraceEnabled() ) {
+            logger.trace( "HACR: aggregateRow for app {} with key {} column {} and value {}",
+                    applicationId, key, column, value );
         }
         if ( "o".equals( counterType ) || "p".equals( counterType ) ) {
             if ( m != null ) {
@@ -340,9 +340,9 @@ public class CounterUtils {
 
     private Mutator<ByteBuffer> batchIncrementEntityCounter( Mutator<ByteBuffer> m, UUID entityId, String name,
                                                              Long value, long timestamp, UUID applicationId ) {
-        if ( logger.isDebugEnabled() ) {
-            logger.debug( "BIEC: Incrementing property {} of entity {} by value {}",
-                    new Object[] { name, entityId, value } );
+        if ( logger.isTraceEnabled() ) {
+            logger.trace( "BIEC: Incrementing property {} of entity {} by value {}",
+                    name, entityId, value );
         }
         addInsertToMutator( m, ENTITY_DICTIONARIES, key( entityId, DICTIONARY_COUNTERS ), name, null, timestamp );
         if ( "o".equals( counterType ) || "p".equals( counterType ) ) {
@@ -359,9 +359,9 @@ public class CounterUtils {
 
     public Mutator<ByteBuffer> batchIncrementQueueCounter( Mutator<ByteBuffer> m, UUID queueId, String name, long value,
                                                            long timestamp, UUID applicationId ) {
-        if ( logger.isDebugEnabled() ) {
-            logger.debug( "BIQC: Incrementing property {} of queue {} by value {}",
-                    new Object[] { name, queueId, value } );
+        if ( logger.isTraceEnabled() ) {
+            logger.trace( "BIQC: Incrementing property {} of queue {} by value {}",
+                    name, queueId, value );
         }
         m.addInsertion( bytebuffer( key( queueId, DICTIONARY_COUNTERS ).toString() ),
                 QueuesCF.QUEUE_DICTIONARIES.toString(),

http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/Setup.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/Setup.java b/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/Setup.java
index ad60b1c..2efbb62 100644
--- a/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/Setup.java
+++ b/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/Setup.java
@@ -18,10 +18,6 @@ package org.apache.usergrid.persistence.cassandra;
 
 import java.util.UUID;
 
-/**
- *
- * @author ApigeeCorporation
- */
 public interface Setup {
 
     /**

http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/util/Slf4jTraceTagReporter.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/util/Slf4jTraceTagReporter.java b/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/util/Slf4jTraceTagReporter.java
index a94f097..e137cec 100644
--- a/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/util/Slf4jTraceTagReporter.java
+++ b/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/util/Slf4jTraceTagReporter.java
@@ -47,10 +47,10 @@ public class Slf4jTraceTagReporter implements TraceTagReporter {
     public void report( TraceTag traceTag ) {
         logger.info( "TraceTag: {}", traceTag.getTraceName() );
         for ( TimedOpTag timedOpTag : traceTag ) {
-            logger.info( "----opId: {} opName: {} startTime: {} elapsed: {}", new Object[] {
+            logger.info( "----opId: {} opName: {} startTime: {} elapsed: {}",
                     timedOpTag.getOpTag(), timedOpTag.getTagName(), new Date( timedOpTag.getStart() ),
                     timedOpTag.getElapsed()
-            } );
+            );
         }
         logger.info( "------" );
     }

http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/util/TraceTagAspect.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/util/TraceTagAspect.java b/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/util/TraceTagAspect.java
index 5825ee0..f9aa70e 100644
--- a/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/util/TraceTagAspect.java
+++ b/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/util/TraceTagAspect.java
@@ -39,8 +39,8 @@ public class TraceTagAspect {
     public Object applyTrace( ProceedingJoinPoint pjp ) throws Throwable {
         String tagName = pjp.toLongString();
 
-        if (logger.isDebugEnabled()) {
-            logger.debug("Applyng trace on {}", tagName);
+        if (logger.isTraceEnabled()) {
+            logger.trace("Applying trace on {}", tagName);
         }
 
         TimedOpTag timedOpTag = traceTagManager.timerInstance();
@@ -56,8 +56,8 @@ public class TraceTagAspect {
             timedOpTag.stopAndApply( tagName, success );
             traceTagManager.addTimer( timedOpTag );
 
-            if (logger.isDebugEnabled()) {
-                logger.debug("TimedOpTag added in Aspect on {}", tagName);
+            if (logger.isTraceEnabled()) {
+                logger.trace("TimedOpTag added in Aspect on {}", tagName);
             }
         }
     }

http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/util/TraceTagManager.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/util/TraceTagManager.java b/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/util/TraceTagManager.java
index fe5cada..1a0756e 100644
--- a/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/util/TraceTagManager.java
+++ b/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/util/TraceTagManager.java
@@ -146,8 +146,8 @@ public class TraceTagManager {
     public void attach( TraceTag traceTag ) {
         Preconditions.checkState( !isActive(), "Attempt to attach on already active trace" );
         localTraceTag.set( traceTag );
-        if (logger.isDebugEnabled()) {
-            logger.debug("Attached TraceTag {} to thread", traceTag);
+        if (logger.isTraceEnabled()) {
+            logger.trace("Attached TraceTag {} to thread", traceTag);
         }
     }
 
@@ -157,8 +157,8 @@ public class TraceTagManager {
         TraceTag traceTag = localTraceTag.get();
         Preconditions.checkState( isActive(), "Attempt to detach on no active trace" );
         localTraceTag.remove();
-        if (logger.isDebugEnabled()) {
-            logger.debug("Detached TraceTag {} from thread", traceTag);
+        if (logger.isTraceEnabled()) {
+            logger.trace("Detached TraceTag {} from thread", traceTag);
         }
         return traceTag;
     }

http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/core/src/main/java/org/apache/usergrid/system/UsergridSystemMonitor.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/system/UsergridSystemMonitor.java b/stack/core/src/main/java/org/apache/usergrid/system/UsergridSystemMonitor.java
index c56315e..87820f2 100644
--- a/stack/core/src/main/java/org/apache/usergrid/system/UsergridSystemMonitor.java
+++ b/stack/core/src/main/java/org/apache/usergrid/system/UsergridSystemMonitor.java
@@ -92,7 +92,7 @@ public class UsergridSystemMonitor {
      * are in debug mode.
      */
     public void maybeLogPayload( long duration, Object... objects ) {
-        if ( duration > timerLogThreshold || logger.isDebugEnabled() ) {
+        if ( duration > timerLogThreshold || logger.isInfoEnabled() ) {
             String message;
             if ( objects.length > 1 ) {
                 message = formatMessage( duration, MapUtils.map( objects ) );

http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/core/src/main/java/org/apache/usergrid/utils/AESUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/utils/AESUtils.java b/stack/core/src/main/java/org/apache/usergrid/utils/AESUtils.java
index 1a75d70..092b925 100644
--- a/stack/core/src/main/java/org/apache/usergrid/utils/AESUtils.java
+++ b/stack/core/src/main/java/org/apache/usergrid/utils/AESUtils.java
@@ -32,7 +32,7 @@ import static org.apache.commons.lang.StringUtils.substring;
 
 public class AESUtils {
 
-    private static final Logger LOG = LoggerFactory.getLogger( AESUtils.class );
+    private static final Logger logger = LoggerFactory.getLogger( AESUtils.class );
 
     private static byte[] linebreak = { };
     private static Cipher cipher;
@@ -45,7 +45,7 @@ public class AESUtils {
             coder = new Base64( 32, linebreak, true );
         }
         catch ( Throwable t ) {
-            LOG.error( "Cipher error", t );
+            logger.error( "Cipher error", t );
         }
     }
 
@@ -59,7 +59,7 @@ public class AESUtils {
             return new String( coder.encode( cipherText ) );
         }
         catch ( Exception e ) {
-            LOG.error( "Encryption error", e );
+            logger.error( "Encryption error", e );
         }
         return null;
     }
@@ -76,7 +76,7 @@ public class AESUtils {
             return new String( decrypted );
         }
         catch ( Exception e ) {
-            LOG.error( "Decryption error", e );
+            logger.error( "Decryption error", e );
         }
         return null;
     }

http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/core/src/main/java/org/apache/usergrid/utils/ConversionUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/utils/ConversionUtils.java b/stack/core/src/main/java/org/apache/usergrid/utils/ConversionUtils.java
index 567a713..60bc64e 100644
--- a/stack/core/src/main/java/org/apache/usergrid/utils/ConversionUtils.java
+++ b/stack/core/src/main/java/org/apache/usergrid/utils/ConversionUtils.java
@@ -643,7 +643,7 @@ public class ConversionUtils {
             }
         }
         catch ( Exception e ) {
-            logger.error( "Unable to get object from bytes for type " + type.getName(), e );
+            logger.error( "Unable to get object from bytes for type {}", type.getName(), e );
         }
         return null;
     }
@@ -683,7 +683,7 @@ public class ConversionUtils {
             }
         }
         catch ( Exception e ) {
-            logger.error( "Unable to get object from bytes for type " + type.getName(), e );
+            logger.error( "Unable to get object from bytes for type {}", type.getName(), e );
         }
         return null;
     }
@@ -748,7 +748,7 @@ public class ConversionUtils {
             }
         }
         catch ( Exception e ) {
-            logger.error( "Unable to get object from bytes for type " + type.getName(), e );
+            logger.error( "Unable to get object from bytes for type {}", type.getName(), e );
         }
         return null;
     }

http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/core/src/main/java/org/apache/usergrid/utils/IndexUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/utils/IndexUtils.java b/stack/core/src/main/java/org/apache/usergrid/utils/IndexUtils.java
index 5fc0f74..a6ad93b 100644
--- a/stack/core/src/main/java/org/apache/usergrid/utils/IndexUtils.java
+++ b/stack/core/src/main/java/org/apache/usergrid/utils/IndexUtils.java
@@ -51,7 +51,7 @@ import static org.apache.usergrid.utils.JsonUtils.toJsonNode;
 
 public class IndexUtils {
 
-    private static final Logger LOG = LoggerFactory.getLogger( IndexUtils.class );
+    private static final Logger logger = LoggerFactory.getLogger( IndexUtils.class );
 
     static Analyzer analyzer = new StandardAnalyzer( Version.LUCENE_30 );
 
@@ -215,7 +215,7 @@ public class IndexUtils {
             ts.end();
         }
         catch ( IOException e ) {
-            LOG.error( "Error getting keywords ", e );
+            logger.error( "Error getting keywords ", e );
         }
         finally {
             try {

http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/core/src/main/java/org/apache/usergrid/utils/JsonUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/utils/JsonUtils.java b/stack/core/src/main/java/org/apache/usergrid/utils/JsonUtils.java
index 4f1b54e..3bb96f9 100644
--- a/stack/core/src/main/java/org/apache/usergrid/utils/JsonUtils.java
+++ b/stack/core/src/main/java/org/apache/usergrid/utils/JsonUtils.java
@@ -47,7 +47,7 @@ import static org.apache.usergrid.utils.StringUtils.stringOrSubstringBeforeFirst
 
 public class JsonUtils {
 
-    private static final Logger LOG = LoggerFactory.getLogger( JsonUtils.class );
+    private static final Logger logger = LoggerFactory.getLogger( JsonUtils.class );
 
     static ObjectMapper mapper = new ObjectMapper();
 
@@ -72,8 +72,8 @@ public class JsonUtils {
             return mapper.writeValueAsString( obj );
         }
         catch ( Throwable t ) {
-            if (LOG.isDebugEnabled()) {
-                LOG.debug("Error generating JSON", t);
+            if (logger.isDebugEnabled()) {
+                logger.debug("Error generating JSON", t);
             }
             throw new JsonWriteException( "Error generating JSON", t );
         }
@@ -86,8 +86,8 @@ public class JsonUtils {
             return indentObjectMapper.writeValueAsString( obj );
         }
         catch ( Throwable t ) {
-            if (LOG.isDebugEnabled()) {
-                LOG.debug("Error generating JSON", t);
+            if (logger.isDebugEnabled()) {
+                logger.debug("Error generating JSON", t);
             }
             throw new JsonWriteException( "Error generating JSON", t );
         }
@@ -100,8 +100,8 @@ public class JsonUtils {
             return mapper.readValue( json, Object.class );
         }
         catch ( Throwable t ) {
-            if (LOG.isDebugEnabled()) {
-                LOG.debug("Error parsing JSON", t);
+            if (logger.isDebugEnabled()) {
+                logger.debug("Error parsing JSON", t);
             }
             throw new JsonReadException( "Error parsing JSON", t );
         }
@@ -124,7 +124,7 @@ public class JsonUtils {
             bytes = smileMapper.writeValueAsBytes( obj );
         }
         catch ( Exception e ) {
-            LOG.error( "Error getting SMILE bytes", e );
+            logger.error( "Error getting SMILE bytes", e );
         }
         if ( bytes != null ) {
             return ByteBuffer.wrap( bytes );
@@ -152,7 +152,7 @@ public class JsonUtils {
                     byteBuffer.remaining(), clazz );
         }
         catch ( Exception e ) {
-            LOG.error( "Error parsing SMILE bytes", e );
+            logger.error( "Error parsing SMILE bytes", e );
         }
         return obj;
     }
@@ -184,7 +184,7 @@ public class JsonUtils {
                     return UUID.fromString( s );
                 }
                 catch ( IllegalArgumentException e ) {
-                    LOG.warn( "Argument to UUID.fromString({}) was invalid.", s, e );
+                    logger.warn( "Argument to UUID.fromString({}) was invalid.", s, e );
                 }
             }
         }
@@ -333,7 +333,7 @@ public class JsonUtils {
             json = mapper.readValue( file, Object.class );
         }
         catch ( Exception e ) {
-            LOG.error( "Error loading JSON", e );
+            logger.error( "Error loading JSON", e );
         }
         return json;
     }

http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/core/src/main/java/org/apache/usergrid/utils/ListUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/utils/ListUtils.java b/stack/core/src/main/java/org/apache/usergrid/utils/ListUtils.java
index 6a88193..6b90389 100644
--- a/stack/core/src/main/java/org/apache/usergrid/utils/ListUtils.java
+++ b/stack/core/src/main/java/org/apache/usergrid/utils/ListUtils.java
@@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory;
 
 
 public class ListUtils extends org.apache.commons.collections.ListUtils {
-    private static final Logger LOG = LoggerFactory.getLogger( ListUtils.class );
+    private static final Logger logger = LoggerFactory.getLogger( ListUtils.class );
 
 
     public static <A> A first( List<A> list ) {
@@ -68,7 +68,7 @@ public class ListUtils extends org.apache.commons.collections.ListUtils {
             return NumberUtils.toInt( ( String ) a );
         }
         catch ( Exception e ) {
-            LOG.warn( "Could not convert list item {} to int", a, e );
+            logger.warn( "Could not convert list item {} to int", a, e );
         }
         return null;
     }
@@ -88,7 +88,7 @@ public class ListUtils extends org.apache.commons.collections.ListUtils {
             return NumberUtils.toLong( ( String ) a );
         }
         catch ( Exception e ) {
-            LOG.warn( "Could not convert list item {} to long", a, e );
+            logger.warn( "Could not convert list item {} to long", a, e );
         }
         return null;
     }
@@ -108,7 +108,7 @@ public class ListUtils extends org.apache.commons.collections.ListUtils {
             return Boolean.parseBoolean( ( String ) a );
         }
         catch ( Exception e ) {
-            LOG.warn( "Could not convert list item {} to boolean", a, e );
+            logger.warn( "Could not convert list item {} to boolean", a, e );
         }
         return null;
     }
@@ -128,7 +128,7 @@ public class ListUtils extends org.apache.commons.collections.ListUtils {
             return UUIDUtils.tryGetUUID( ( String ) i );
         }
         catch ( Exception e ) {
-            LOG.warn( "Could not convert list item {} to UUID", i, e );
+            logger.warn( "Could not convert list item {} to UUID", i, e );
         }
         return null;
     }

http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/core/src/main/java/org/apache/usergrid/utils/StringUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/utils/StringUtils.java b/stack/core/src/main/java/org/apache/usergrid/utils/StringUtils.java
index 5f64ef3..b91b866 100644
--- a/stack/core/src/main/java/org/apache/usergrid/utils/StringUtils.java
+++ b/stack/core/src/main/java/org/apache/usergrid/utils/StringUtils.java
@@ -29,7 +29,7 @@ import static org.apache.usergrid.utils.ConversionUtils.string;
 
 public class StringUtils extends org.apache.commons.lang.StringUtils {
 
-    private static final Logger LOG = LoggerFactory.getLogger( StringUtils.class );
+    private static final Logger logger = LoggerFactory.getLogger( StringUtils.class );
 
 
     public static Object lower( Object obj ) {
@@ -165,7 +165,7 @@ public class StringUtils extends org.apache.commons.lang.StringUtils {
             return IOUtils.toString( StringUtils.class.getResourceAsStream( filePath ) );
         }
         catch ( Exception e ) {
-            LOG.error( "Error getting file from classpath: " + filePath, e );
+            logger.error( "Error getting file from classpath: {}", filePath, e );
         }
         return null;
     }

http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/corepersistence/cache/src/main/java/org/apache/usergrid/persistence/cache/impl/ScopedCacheSerializationImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/cache/src/main/java/org/apache/usergrid/persistence/cache/impl/ScopedCacheSerializationImpl.java b/stack/corepersistence/cache/src/main/java/org/apache/usergrid/persistence/cache/impl/ScopedCacheSerializationImpl.java
index 22c304a..1f763b2 100644
--- a/stack/corepersistence/cache/src/main/java/org/apache/usergrid/persistence/cache/impl/ScopedCacheSerializationImpl.java
+++ b/stack/corepersistence/cache/src/main/java/org/apache/usergrid/persistence/cache/impl/ScopedCacheSerializationImpl.java
@@ -135,12 +135,11 @@ public class ScopedCacheSerializationImpl<K,V> implements ScopedCacheSerializati
                 V value = MAPPER.readValue(result.getByteArrayValue(), typeRef);
 
                 logger.debug("Read cache item from scope {}\n   key/value types {}/{}\n   key:value: {}:{}",
-                    new Object[]{
                         scope.getApplication().getUuid(),
                         key.getClass().getSimpleName(),
                         value.getClass().getSimpleName(),
                         key,
-                        value});
+                        value);
 
                 return value;
 
@@ -196,12 +195,11 @@ public class ScopedCacheSerializationImpl<K,V> implements ScopedCacheSerializati
         executeBatch(batch);
 
         logger.debug("Wrote cache item to scope {}\n   key/value types {}/{}\n   key:value: {}:{}",
-            new Object[] {
                 scope.getApplication().getUuid(),
                 key.getClass().getSimpleName(),
                 value.getClass().getSimpleName(),
                 key,
-                value});
+                value);
 
         return value;
     }

http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/delete/MarkCommit.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/delete/MarkCommit.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/delete/MarkCommit.java
index a0d0c1a..460c271 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/delete/MarkCommit.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/delete/MarkCommit.java
@@ -53,7 +53,7 @@ import rx.functions.Action1;
 @Singleton
 public class MarkCommit implements Action1<CollectionIoEvent<MvccEntity>> {
 
-    private static final Logger LOG = LoggerFactory.getLogger( MarkCommit.class );
+    private static final Logger logger = LoggerFactory.getLogger( MarkCommit.class );
 
     private final MvccLogEntrySerializationStrategy logStrat;
     private final MvccEntitySerializationStrategy entityStrat;
@@ -94,7 +94,7 @@ public class MarkCommit implements Action1<CollectionIoEvent<MvccEntity>> {
         final ApplicationScope applicationScope = idIoEvent.getEntityCollection();
 
 
-        LOG.debug("Inserting tombstone for entity {} at version {}", entityId, version );
+        logger.debug("Inserting tombstone for entity {} at version {}", entityId, version );
 
         final MvccLogEntry startEntry =
                 new MvccLogEntryImpl( entityId, version, Stage.COMMITTED, MvccLogEntry.State.DELETED );
@@ -177,4 +177,4 @@ public class MarkCommit implements Action1<CollectionIoEvent<MvccEntity>> {
 //
 //        final int removedCount = deleteFieldsObservable.count().toBlocking().last();
 //
-//        LOG.debug("Removed unique values for {} entities of entity {}", removedCount, entityId );
+//        logger.debug("Removed unique values for {} entities of entity {}", removedCount, entityId );

http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/delete/MarkStart.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/delete/MarkStart.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/delete/MarkStart.java
index 3c4ea95..37b3b04 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/delete/MarkStart.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/delete/MarkStart.java
@@ -56,7 +56,7 @@ import rx.functions.Func1;
 @Singleton
 public class MarkStart implements Func1<CollectionIoEvent<Id>, CollectionIoEvent<MvccEntity>> {
 
-    private static final Logger LOG = LoggerFactory.getLogger( MarkStart.class );
+    private static final Logger logger = LoggerFactory.getLogger( MarkStart.class );
 
 
     private final MvccLogEntrySerializationStrategy logStrategy;
@@ -98,7 +98,7 @@ public class MarkStart implements Func1<CollectionIoEvent<Id>, CollectionIoEvent
             write.execute();
         }
         catch ( ConnectionException e ) {
-            LOG.error( "Failed to execute write asynchronously ", e );
+            logger.error( "Failed to execute write asynchronously ", e );
             throw new CollectionRuntimeException( null, applicationScope,
                     "Failed to execute write asynchronously ", e );
         }

http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/delete/VersionCompact.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/delete/VersionCompact.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/delete/VersionCompact.java
index 5554a5f..c9d11be 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/delete/VersionCompact.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/delete/VersionCompact.java
@@ -91,7 +91,7 @@ public class VersionCompact
                         if ( logger.isDebugEnabled() ) {
                             logger.debug(
                                 "Deleting log entry and version data for entity id {} and version {} in app scope {}",
-                                new Object[] { entityId, version, scope } );
+                                entityId, version, scope );
                         }
 
 

http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/RollbackAction.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/RollbackAction.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/RollbackAction.java
index 8342e55..23c6dfe 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/RollbackAction.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/RollbackAction.java
@@ -47,7 +47,7 @@ import rx.schedulers.Schedulers;
  */
 public class RollbackAction implements Action1<Throwable> {
 
-    private static final Logger log = LoggerFactory.getLogger( RollbackAction.class );
+    private static final Logger logger = LoggerFactory.getLogger( RollbackAction.class );
 
     private final UniqueValueSerializationStrategy uniqueValueStrat;
     private final MvccLogEntrySerializationStrategy logEntryStrat;

http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteCommit.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteCommit.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteCommit.java
index 21570ec..7eb96e7 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteCommit.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteCommit.java
@@ -58,7 +58,7 @@ import rx.functions.Func1;
 @Singleton
 public class WriteCommit implements Func1<CollectionIoEvent<MvccEntity>, CollectionIoEvent<MvccEntity>> {
 
-    private static final Logger LOG = LoggerFactory.getLogger( WriteCommit.class );
+    private static final Logger logger = LoggerFactory.getLogger( WriteCommit.class );
 
     @Inject
     private UniqueValueSerializationStrategy uniqueValueStrat;
@@ -119,7 +119,7 @@ public class WriteCommit implements Func1<CollectionIoEvent<MvccEntity>, Collect
 
                 MutationBatch mb = uniqueValueStrat.write(applicationScope,  written );
 
-                LOG.debug("Finalizing {} unqiue value {}", field.getName(), field.getValue().toString());
+                logger.debug("Finalizing {} unique value {}", field.getName(), field.getValue().toString());
 
                 // merge into our existing mutation batch
                 logMutation.mergeShallow( mb );
@@ -129,7 +129,7 @@ public class WriteCommit implements Func1<CollectionIoEvent<MvccEntity>, Collect
             logMutation.execute();
         }
         catch ( ConnectionException e ) {
-            LOG.error( "Failed to execute write asynchronously ", e );
+            logger.error( "Failed to execute write asynchronously ", e );
             throw new WriteCommitException( mvccEntity, applicationScope,
                 "Failed to execute write asynchronously ", e );
         }

http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteOptimisticVerify.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteOptimisticVerify.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteOptimisticVerify.java
index 4ced629..6a69038 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteOptimisticVerify.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteOptimisticVerify.java
@@ -45,7 +45,7 @@ import rx.functions.Action1;
 @Singleton
 public class WriteOptimisticVerify implements Action1<CollectionIoEvent<MvccEntity>> {
 
-    private static final Logger log = LoggerFactory.getLogger( WriteOptimisticVerify.class );
+    private static final Logger logger = LoggerFactory.getLogger( WriteOptimisticVerify.class );
 
     private final MvccLogEntrySerializationStrategy logEntryStrat;
 
@@ -81,7 +81,7 @@ public class WriteOptimisticVerify implements Action1<CollectionIoEvent<MvccEnti
         // Previous log entry must be committed, otherwise somebody is already writing
         if ( versions.size() > 1 && versions.get( 1 ).getStage().ordinal() < Stage.COMMITTED.ordinal() ) {
 
-            log.debug( "Conflict writing entity id {} version {}", entity.getId().toString(),
+            logger.debug( "Conflict writing entity id {} version {}", entity.getId().toString(),
                     entity.getVersion().toString() );
 
             throw new WriteOptimisticVerifyException( mvccEntity, applicationScope,

http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteStart.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteStart.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteStart.java
index 79b2d85..5de885e 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteStart.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteStart.java
@@ -36,7 +36,7 @@ import static org.apache.usergrid.persistence.core.util.ValidationUtils.verifyEn
 @Singleton
 public class WriteStart implements Func1<CollectionIoEvent<Entity>, CollectionIoEvent<MvccEntity>> {
 
-    private static final Logger LOG = LoggerFactory.getLogger( WriteStart.class );
+    private static final Logger logger = LoggerFactory.getLogger( WriteStart.class );
 
     private final MvccLogEntrySerializationStrategy logStrategy;
 
@@ -75,11 +75,11 @@ public class WriteStart implements Func1<CollectionIoEvent<Entity>, CollectionIo
                 try {
                     write.execute();
                 } catch (ConnectionException e) {
-                    LOG.error("Failed to execute write ", e);
+                    logger.error("Failed to execute write ", e);
                     throw new WriteStartException(nextStage, applicationScope,
                         "Failed to execute write ", e);
                 } catch (NullPointerException e) {
-                    LOG.error("Failed to execute write ", e);
+                    logger.error("Failed to execute write ", e);
                     throw new WriteStartException(nextStage, applicationScope,
                         "Failed to execute write", e);
                 }

http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteUniqueVerify.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteUniqueVerify.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteUniqueVerify.java
index 564d036..780b83b 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteUniqueVerify.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteUniqueVerify.java
@@ -62,7 +62,7 @@ import rx.functions.Action1;
 @Singleton
 public class WriteUniqueVerify implements Action1<CollectionIoEvent<MvccEntity>> {
 
-    private static final Logger LOG = LoggerFactory.getLogger( WriteUniqueVerify.class );
+    private static final Logger logger = LoggerFactory.getLogger( WriteUniqueVerify.class );
 
     private final UniqueValueSerializationStrategy uniqueValueStrat;
 

http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
index d5db5c9..57199e2 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
@@ -75,7 +75,7 @@ import rx.schedulers.Schedulers;
  */
 public abstract class MvccEntitySerializationStrategyImpl implements MvccEntitySerializationStrategy {
 
-    private static final Logger log = LoggerFactory.getLogger( MvccLogEntrySerializationStrategyImpl.class );
+    private static final Logger logger = LoggerFactory.getLogger( MvccLogEntrySerializationStrategyImpl.class );
 
 
     protected final Keyspace keyspace;
@@ -419,9 +419,9 @@ public abstract class MvccEntitySerializationStrategyImpl implements MvccEntityS
                 deSerialized = column.getValue( entityJsonSerializer );
             }
             catch ( DataCorruptionException e ) {
-                log.error(
-                        "DATA CORRUPTION DETECTED when de-serializing entity with Id {} and version {}.  This means the"
-                                + " write was truncated.", id, version, e );
+                logger.error(
+                        "DATA CORRUPTION DETECTED when de-serializing entity with Id {} and version {}.  This means the write was truncated.",
+                        id, version, e );
                 //return an empty entity, we can never load this one, and we don't want it to bring the system
                 //to a grinding halt
                 return new MvccEntityImpl( id, version, MvccEntity.Status.DELETED, Optional.<Entity>absent(),0 );

http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccLogEntrySerializationStrategyImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccLogEntrySerializationStrategyImpl.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccLogEntrySerializationStrategyImpl.java
index 7ba6a5e..f28fa26 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccLogEntrySerializationStrategyImpl.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccLogEntrySerializationStrategyImpl.java
@@ -60,7 +60,7 @@ import com.netflix.astyanax.serializers.AbstractSerializer;
  */
 public abstract class MvccLogEntrySerializationStrategyImpl<K> implements MvccLogEntrySerializationStrategy {
 
-    private static final Logger LOG = LoggerFactory.getLogger( MvccLogEntrySerializationStrategyImpl.class );
+    private static final Logger logger = LoggerFactory.getLogger( MvccLogEntrySerializationStrategyImpl.class );
 
     private static final StageSerializer SER = new StageSerializer();
 
@@ -277,7 +277,9 @@ public abstract class MvccLogEntrySerializationStrategyImpl<K> implements MvccLo
 
         final long timestamp = version.timestamp();
 
-        LOG.debug( "Writing version with timestamp '{}'", timestamp );
+        if (logger.isTraceEnabled()) {
+            logger.trace("Writing version with timestamp '{}'", timestamp);
+        }
 
         final Id applicationId = collectionScope.getApplication();
 

http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyImpl.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyImpl.java
index 781490d..622ebef 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyImpl.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyImpl.java
@@ -225,12 +225,11 @@ public abstract class UniqueValueSerializationStrategyImpl<FieldKey, EntityKey>
             ScopedRowKey.fromKey( applicationId, entityKey ) ) );
 
 
-        if ( log.isDebugEnabled() ) {
-            log.debug( "Writing unique value version={} name={} value={} ",
-                new Object[] {
+        if ( log.isTraceEnabled() ) {
+            log.trace( "Writing unique value version={} name={} value={} ",
                     uniqueValue.getEntityVersion(), uniqueValue.getField().getName(),
                     uniqueValue.getField().getValue()
-                } );
+                );
         }
 
 

http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/migration/MvccEntityDataMigrationImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/migration/MvccEntityDataMigrationImpl.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/migration/MvccEntityDataMigrationImpl.java
index 5143c49..a110ed7 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/migration/MvccEntityDataMigrationImpl.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/migration/MvccEntityDataMigrationImpl.java
@@ -68,7 +68,7 @@ import rx.schedulers.Schedulers;
 public class MvccEntityDataMigrationImpl implements DataMigration{
 
 
-    private static final Logger LOGGER = LoggerFactory.getLogger( MvccEntityDataMigrationImpl.class );
+    private static final Logger logger = LoggerFactory.getLogger( MvccEntityDataMigrationImpl.class );
 
     private final Keyspace keyspace;
     private final VersionedMigrationSet<MvccEntitySerializationStrategy> allVersions;
@@ -149,7 +149,7 @@ public class MvccEntityDataMigrationImpl implements DataMigration{
                                     new EntityToSaveMessage(currentScope, allVersions.next());
                                 subscriber.onNext(message);
                             }catch (Exception e){
-                                LOGGER.error("Failed to load entity " +entityIdScope.getId(),e);
+                                logger.error("Failed to load entity {}", entityIdScope.getId(),e);
                             }
                         }
 
@@ -224,7 +224,7 @@ public class MvccEntityDataMigrationImpl implements DataMigration{
                                     totalBatch.mergeShallow(mb);
                                 }
                             }catch (Exception e){
-                                LOGGER.error("Failed to migrate entity "+ message.entity.getId().getUuid()+ " :: " + message.entity.getId().getType(),e);
+                                logger.error("Failed to migrate entity {} :: {}", message.entity.getId().getUuid(), message.entity.getId().getType(),e);
                             }
 
 

http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/MultiKeyColumnNameIterator.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/MultiKeyColumnNameIterator.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/MultiKeyColumnNameIterator.java
index 8c12a25..c24940b 100644
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/MultiKeyColumnNameIterator.java
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/MultiKeyColumnNameIterator.java
@@ -51,7 +51,7 @@ import rx.schedulers.Schedulers;
 public class MultiKeyColumnNameIterator<C, T> implements Iterable<T>, Iterator<T> {
 
 
-    private static final Logger LOG = LoggerFactory.getLogger( MultiKeyColumnNameIterator.class );
+    private static final Logger logger = LoggerFactory.getLogger( MultiKeyColumnNameIterator.class );
 
     private Iterator<T> iterator;
 
@@ -222,7 +222,7 @@ public class MultiKeyColumnNameIterator<C, T> implements Iterable<T>, Iterator<T
             //may block if we get full, that's expected behavior
 
             try {
-                if (LOG.isTraceEnabled()) LOG.trace( "Received element {}" , t );
+                if (logger.isTraceEnabled()) logger.trace( "Received element {}" , t );
                 queue.put( t );
             }
             catch ( InterruptedException e ) {

http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/executor/TaskExecutorFactory.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/executor/TaskExecutorFactory.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/executor/TaskExecutorFactory.java
index 4ffabf7..5e7761c 100644
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/executor/TaskExecutorFactory.java
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/executor/TaskExecutorFactory.java
@@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory;
  */
 public class TaskExecutorFactory {
 
-    private static final Logger log = LoggerFactory.getLogger( TaskExecutorFactory.class );
+    private static final Logger logger = LoggerFactory.getLogger( TaskExecutorFactory.class );
 
 
     public enum RejectionAction {
@@ -168,7 +168,7 @@ public class TaskExecutorFactory {
 
         @Override
         public void rejectedExecution( final Runnable r, final ThreadPoolExecutor executor ) {
-            log.warn( "{} task queue full, rejecting task {} and running in thread {}", poolName, r,
+            logger.warn( "{} task queue full, rejecting task {} and running in thread {}", poolName, r,
                 Thread.currentThread().getName() );
 
             //We've decided we want to have a "caller runs" policy, to just invoke the task when rejected
@@ -191,7 +191,7 @@ public class TaskExecutorFactory {
 
         @Override
         public void rejectedExecution( final Runnable r, final ThreadPoolExecutor executor ) {
-            log.warn( "{} task queue full, dropping task {}", poolName, r );
+            logger.warn( "{} task queue full, dropping task {}", poolName, r );
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/metrics/MetricsFactoryImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/metrics/MetricsFactoryImpl.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/metrics/MetricsFactoryImpl.java
index 1b2dfdb..51afc59 100644
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/metrics/MetricsFactoryImpl.java
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/metrics/MetricsFactoryImpl.java
@@ -18,7 +18,6 @@ package org.apache.usergrid.persistence.core.metrics;
 
 
 import java.net.InetSocketAddress;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 
 import org.slf4j.Logger;
@@ -29,7 +28,6 @@ import com.codahale.metrics.Gauge;
 import com.codahale.metrics.Histogram;
 import com.codahale.metrics.JmxReporter;
 import com.codahale.metrics.Meter;
-import com.codahale.metrics.Metric;
 import com.codahale.metrics.MetricFilter;
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.Timer;
@@ -49,7 +47,7 @@ public class MetricsFactoryImpl implements MetricsFactory {
     private MetricRegistry registry;
     private GraphiteReporter graphiteReporter;
     private JmxReporter jmxReporter;
-    private static final Logger LOG = LoggerFactory.getLogger(MetricsFactoryImpl.class);
+    private static final Logger logger = LoggerFactory.getLogger(MetricsFactoryImpl.class);
 
 
     @Inject
@@ -64,7 +62,7 @@ public class MetricsFactoryImpl implements MetricsFactory {
                 .build(graphite);
             graphiteReporter.start(30, TimeUnit.SECONDS);
         } else {
-            LOG.warn("MetricsService:Logger not started.");
+            logger.warn("MetricsService:Logger not started.");
         }
 
         jmxReporter = JmxReporter.forRegistry(registry).build();

http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/schema/MigrationManagerImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/schema/MigrationManagerImpl.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/schema/MigrationManagerImpl.java
index 4075437..db694fe 100644
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/schema/MigrationManagerImpl.java
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/schema/MigrationManagerImpl.java
@@ -81,9 +81,8 @@ public class MigrationManagerImpl implements MigrationManager {
 
                 if ( columnFamilies == null || columnFamilies.size() == 0 ) {
                     logger.warn(
-                            "Class {} implements {} but returns null column families for migration.  Either implement"
-                                    + " this method or remove the interface from the class", migration.getClass(),
-                            Migration.class );
+                            "Class {} implements {} but returns null column families for migration.  Either implement this method or remove the interface from the class",
+                            migration.getClass(), Migration.class );
                     continue;
                 }
 

http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/rx/ObservableIterator.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/rx/ObservableIterator.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/rx/ObservableIterator.java
index 81cc973..bad2b69 100644
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/rx/ObservableIterator.java
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/rx/ObservableIterator.java
@@ -37,7 +37,7 @@ import rx.Subscriber;
  */
 public abstract class ObservableIterator<T> implements Observable.OnSubscribe<T> {
 
-    private static final Logger log = LoggerFactory.getLogger( ObservableIterator.class );
+    private static final Logger logger = LoggerFactory.getLogger( ObservableIterator.class );
 
     private final String name;
 
@@ -66,7 +66,7 @@ public abstract class ObservableIterator<T> implements Observable.OnSubscribe<T>
             while ( itr.hasNext() && !subscriber.isUnsubscribed() ) {
                 final T next = itr.next();
 
-                if (log.isTraceEnabled()) log.trace( "Iterator '{}' emitting item '{}'", name, next );
+                if (logger.isTraceEnabled()) logger.trace( "Iterator '{}' emitting item '{}'", name, next );
 
                 subscriber.onNext( next );
             }

http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/rx/OrderedMerge.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/rx/OrderedMerge.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/rx/OrderedMerge.java
index 1c33f58..38f7d8e 100644
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/rx/OrderedMerge.java
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/rx/OrderedMerge.java
@@ -50,7 +50,7 @@ import rx.subscriptions.CompositeSubscription;
  */
 public final class OrderedMerge<T> implements Observable.OnSubscribe<T> {
 
-    private static final Logger log = LoggerFactory.getLogger( OrderedMerge.class );
+    private static final Logger logger = LoggerFactory.getLogger( OrderedMerge.class );
 
     //the comparator to compare items
     private final Comparator<T> comparator;
@@ -149,7 +149,7 @@ public final class OrderedMerge<T> implements Observable.OnSubscribe<T> {
             //we're done, just drain the queue since there are no more running producers
             if ( completed == innerSubscribers.size() ) {
 
-                if (log.isTraceEnabled()) log.trace( "Completing Observable.  Draining elements from the subscribers", innerSubscribers.size() );
+                if (logger.isTraceEnabled()) logger.trace( "Completing Observable.  Draining {} elements from the subscribers", innerSubscribers.size() );
 
                 //Drain the queues
                 while ( !subscriber.isUnsubscribed() && (!nextValues.isEmpty() || !toProduce.isEmpty()) ) {
@@ -225,7 +225,7 @@ public final class OrderedMerge<T> implements Observable.OnSubscribe<T> {
 
                         final T value = inner.pop();
 
-                        if (log.isTraceEnabled()) log.trace( "Emitting value {}", value );
+                        if (logger.isTraceEnabled()) logger.trace( "Emitting value {}", value );
 
                         subscriber.onNext( value );
 

http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/impl/GraphManagerImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/impl/GraphManagerImpl.java b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/impl/GraphManagerImpl.java
index 93ae753..e865377 100644
--- a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/impl/GraphManagerImpl.java
+++ b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/impl/GraphManagerImpl.java
@@ -66,7 +66,7 @@ import rx.Observable;
  */
 public class GraphManagerImpl implements GraphManager {
 
-    private static final Logger LOG = LoggerFactory.getLogger( GraphManagerImpl.class );
+    private static final Logger logger = LoggerFactory.getLogger( GraphManagerImpl.class );
 
     private final ApplicationScope scope;
 
@@ -188,7 +188,9 @@ public class GraphManagerImpl implements GraphManager {
             final MutationBatch edgeMutation = storageEdgeSerialization.writeEdge( scope, edge1, timestamp );
 
 
-            LOG.debug( "Marking edge {} as deleted to commit log", edge1 );
+            if (logger.isTraceEnabled()) {
+                logger.trace("Marking edge {} as deleted to commit log", edge1);
+            }
             try {
                 edgeMutation.execute();
             }
@@ -223,7 +225,7 @@ public class GraphManagerImpl implements GraphManager {
                 //fire our delete listener and wait for the results
                 edgeDeleteListener.receive( scope, marked, startTimestamp ).doOnNext(
                     //log them
-                    count -> LOG.debug( "removed {} types for edge {} ", count, edge ) )
+                    count -> logger.trace( "removed {} types for edge {} ", count, edge ) )
                     //return the marked edge
                     .map( count -> marked ) );
 
@@ -241,7 +243,9 @@ public class GraphManagerImpl implements GraphManager {
             final MutationBatch nodeMutation = nodeSerialization.mark( scope, id, timestamp );
 
 
-            LOG.debug( "Marking node {} as deleted to node mark", node );
+            if (logger.isTraceEnabled()) {
+                logger.trace("Marking node {} as deleted to node mark", node);
+            }
             try {
                 nodeMutation.execute();
             }
@@ -273,7 +277,7 @@ public class GraphManagerImpl implements GraphManager {
                     //set to 0 if nothing is emitted
                 .lastOrDefault( 0 )
                     //log for posterity
-                .doOnNext( count -> LOG.debug( "Removed {} edges from node {}", count, inputNode ) )
+                .doOnNext( count -> logger.trace( "Removed {} edges from node {}", count, inputNode ) )
                     //return our id
                 .map( count -> inputNode );
 

http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/impl/stage/EdgeMetaRepairImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/impl/stage/EdgeMetaRepairImpl.java b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/impl/stage/EdgeMetaRepairImpl.java
index 206145a..be9ef6b 100644
--- a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/impl/stage/EdgeMetaRepairImpl.java
+++ b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/impl/stage/EdgeMetaRepairImpl.java
@@ -51,7 +51,6 @@ import com.netflix.astyanax.connectionpool.exceptions.ConnectionException;
 
 import rx.Observable;
 import rx.functions.Action1;
-import rx.functions.Func1;
 import rx.observables.MathObservable;
 
 
@@ -62,7 +61,7 @@ import rx.observables.MathObservable;
 public class EdgeMetaRepairImpl implements EdgeMetaRepair {
 
 
-    private static final Logger LOG = LoggerFactory.getLogger( EdgeMetaRepairImpl.class );
+    private static final Logger logger = LoggerFactory.getLogger( EdgeMetaRepairImpl.class );
     private static final Log RX_LOG = new Log();
 
     private final EdgeMetadataSerialization edgeMetadataSerialization;
@@ -128,8 +127,10 @@ public class EdgeMetaRepairImpl implements EdgeMetaRepair {
                     //for each id type, check if the exist in parallel to increase processing speed
                     for ( final String subType : types ) {
 
-                        LOG.debug( "Checking for edges with nodeId {}, type {}, and subtype {}", node, edgeType,
-                                subType );
+                        if (logger.isTraceEnabled()) {
+                            logger.trace("Checking for edges with nodeId {}, type {}, and subtype {}", node, edgeType,
+                                    subType);
+                        }
 
                         Observable<Integer> search =
                                 //load each edge in it's own thread
@@ -147,16 +148,18 @@ public class EdgeMetaRepairImpl implements EdgeMetaRepair {
                                                   * iteration
                                                   **/
                                                  if ( count != 0 ) {
-                                                     LOG.debug( "Found edge with nodeId {}, type {}, "
-                                                                     + "and subtype {}. Not removing subtype. ",
-                                                             node, edgeType, subType );
+                                                     if (logger.isTraceEnabled()) {
+                                                         logger.trace("Found edge with nodeId {}, type {}, and subtype {}. Not removing subtype. ",
+                                                                 node, edgeType, subType);
+                                                     }
                                                      return;
                                                  }
 
 
-                                                 LOG.debug( "No edges with nodeId {}, type {}, "
-                                                                 + "and subtype {}. Removing subtype.", node,
-                                                         edgeType, subType );
+                                                 if (logger.isTraceEnabled()) {
+                                                     logger.trace("No edges with nodeId {}, type {}, and subtype {}. Removing subtype.",
+                                                             node, edgeType, subType);
+                                                 }
                                                  batch.mergeShallow( serialization
                                                          .removeEdgeSubType( scope, node, edgeType, subType,
                                                              maxTimestamp ) );
@@ -176,9 +179,10 @@ public class EdgeMetaRepairImpl implements EdgeMetaRepair {
                                          .doOnNext( count -> {
 
 
-                                             LOG.debug( "Executing batch for subtype deletion with " +
-                                                     "type {}.  " + "Mutation has {} rows to mutate ",
-                                                 edgeType, batch.getRowCount() );
+                                             if (logger.isTraceEnabled()) {
+                                                 logger.trace("Executing batch for subtype deletion with type {}.  Mutation has {} rows to mutate ",
+                                                         edgeType, batch.getRowCount());
+                                             }
 
                                              try {
                                                  batch.execute();
@@ -204,14 +208,18 @@ public class EdgeMetaRepairImpl implements EdgeMetaRepair {
              * We can only execute deleting this type if no sub types were deleted
              */
             if ( subTypeUsedCount != 0 ) {
-                LOG.debug( "Type {} has {} subtypes in use as of maxTimestamp {}.  Not deleting type.", edgeType,
-                        subTypeUsedCount, maxTimestamp );
+                if (logger.isTraceEnabled()) {
+                    logger.trace("Type {} has {} subtypes in use as of maxTimestamp {}.  Not deleting type.", edgeType,
+                            subTypeUsedCount, maxTimestamp);
+                }
                 return;
             }
 
 
-            LOG.debug( "Type {} has no subtypes in use as of maxTimestamp {}.  Deleting type.", edgeType,
-                    maxTimestamp );
+            if (logger.isTraceEnabled()) {
+                logger.trace("Type {} has no subtypes in use as of maxTimestamp {}.  Deleting type.", edgeType,
+                        maxTimestamp);
+            }
             try {
                 serialization.removeEdgeType( scope, node, edgeType, maxTimestamp ).execute();
             }
@@ -355,7 +363,9 @@ public class EdgeMetaRepairImpl implements EdgeMetaRepair {
 
         @Override
         public void call( final MarkedEdge markedEdge ) {
-            LOG.debug( "Emitting edge {}", markedEdge );
+            if (logger.isTraceEnabled()) {
+                logger.trace("Emitting edge {}", markedEdge);
+            }
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/impl/stage/NodeDeleteListenerImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/impl/stage/NodeDeleteListenerImpl.java b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/impl/stage/NodeDeleteListenerImpl.java
index 343cc77..cd5b1a8 100644
--- a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/impl/stage/NodeDeleteListenerImpl.java
+++ b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/impl/stage/NodeDeleteListenerImpl.java
@@ -21,7 +21,6 @@ package org.apache.usergrid.persistence.graph.impl.stage;
 
 import java.util.HashSet;
 import java.util.Iterator;
-import java.util.List;
 import java.util.Set;
 import java.util.UUID;
 
@@ -51,7 +50,6 @@ import com.netflix.astyanax.connectionpool.exceptions.ConnectionException;
 import rx.Observable;
 import rx.functions.Action0;
 import rx.functions.Func1;
-import rx.schedulers.Schedulers;
 
 
 /**
@@ -60,7 +58,7 @@ import rx.schedulers.Schedulers;
 public class NodeDeleteListenerImpl implements NodeDeleteListener {
 
 
-    private static final Logger LOG = LoggerFactory.getLogger( NodeDeleteListenerImpl.class );
+    private static final Logger logger = LoggerFactory.getLogger( NodeDeleteListenerImpl.class );
 
     private final NodeSerialization nodeSerialization;
     private final EdgeSerialization storageSerialization;
@@ -112,7 +110,9 @@ public class NodeDeleteListenerImpl implements NodeDeleteListener {
 
                         final Optional<Long> maxVersion = nodeSerialization.getMaxVersion( scope, node );
 
-                        LOG.debug( "Node with id {} has max version of {}", node, maxVersion.orNull() );
+                        if (logger.isTraceEnabled()) {
+                            logger.trace("Node with id {} has max version of {}", node, maxVersion.orNull());
+                        }
 
 
                         if ( !maxVersion.isPresent() ) {
@@ -184,7 +184,9 @@ public class NodeDeleteListenerImpl implements NodeDeleteListener {
                 //buffer and delete marked edges in our buffer size so we're making less trips to cassandra
                 .buffer( graphFig.getScanPageSize() ).flatMap( markedEdges -> {
 
-                    LOG.debug( "Batching {} edges for node {} for deletion", markedEdges.size(), node );
+                    if (logger.isTraceEnabled()) {
+                        logger.trace("Batching {} edges for node {} for deletion", markedEdges.size(), node);
+                    }
 
                     final MutationBatch batch = keyspace.prepareMutationBatch();
 
@@ -219,14 +221,18 @@ public class NodeDeleteListenerImpl implements NodeDeleteListener {
                     //we want them running on the i/o thread from the Observable emitting all the edges
 
                     //
-                    LOG.debug( "About to audit {} source types", sourceNodes.size() );
+                    if (logger.isTraceEnabled()) {
+                        logger.trace("About to audit {} source types", sourceNodes.size());
+                    }
 
                     Observable<Integer> sourceMetaCleanup =
                             Observable.from( sourceNodes ).flatMap( targetPair -> edgeMetaRepair
                                     .repairSources( scope, targetPair.id, targetPair.edgeType, maxVersion ) ).last();
 
 
-                    LOG.debug( "About to audit {} target types", targetNodes.size() );
+                    if (logger.isTraceEnabled()) {
+                        logger.trace("About to audit {} target types", targetNodes.size());
+                    }
 
                     Observable<Integer> targetMetaCleanup =
                             Observable.from( targetNodes ).flatMap( targetPair -> edgeMetaRepair

http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/EdgesObservableImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/EdgesObservableImpl.java b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/EdgesObservableImpl.java
index bd76291..20efe42 100644
--- a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/EdgesObservableImpl.java
+++ b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/EdgesObservableImpl.java
@@ -61,7 +61,9 @@ public class EdgesObservableImpl implements EdgesObservable {
 
         return edgeTypes.flatMap(  edgeType -> {
 
-                logger.debug( "Loading edges of edgeType {} from {}", edgeType, sourceNode );
+                if (logger.isTraceEnabled()) {
+                    logger.trace("Loading edges of edgeType {} from {}", edgeType, sourceNode);
+                }
 
                 return gm.loadEdgesFromSource(
                     new SimpleSearchByEdgeType( sourceNode, edgeType, Long.MAX_VALUE, SearchByEdgeType.Order.DESCENDING,
@@ -82,7 +84,9 @@ public class EdgesObservableImpl implements EdgesObservable {
 
         return edgeTypes.flatMap(  edgeType -> {
 
-                logger.debug( "Loading edges of edgeType {} from {}", edgeType, sourceNode );
+                if (logger.isTraceEnabled()) {
+                    logger.trace("Loading edges of edgeType {} from {}", edgeType, sourceNode);
+                }
 
                 return gm.loadEdgesFromSource(
                     new SimpleSearchByEdgeType( sourceNode, edgeType, Long.MAX_VALUE, SearchByEdgeType.Order.DESCENDING,
@@ -100,7 +104,9 @@ public class EdgesObservableImpl implements EdgesObservable {
 
         return edgeTypes.flatMap( edgeType -> {
 
-            logger.debug( "Loading edges of edgeType {} from {}", edgeType, sourceNode );
+            if (logger.isTraceEnabled()) {
+                logger.trace("Loading edges of edgeType {} from {}", edgeType, sourceNode);
+            }
 
             return gm.loadEdgesFromSourceByType(
                 new SimpleSearchByIdType( sourceNode, edgeType, Long.MAX_VALUE, SearchByEdgeType.Order.DESCENDING,
@@ -119,7 +125,9 @@ public class EdgesObservableImpl implements EdgesObservable {
 
         return edgeTypes.flatMap( edgeType -> {
 
-            logger.debug( "Loading edges of edgeType {} to {}", edgeType, targetNode );
+            if (logger.isTraceEnabled()) {
+                logger.trace("Loading edges of edgeType {} to {}", edgeType, targetNode);
+            }
 
             return gm.loadEdgesToTarget(
                 new SimpleSearchByEdgeType( targetNode, edgeType, Long.MAX_VALUE, SearchByEdgeType.Order.DESCENDING,

http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/TargetIdObservableImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/TargetIdObservableImpl.java b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/TargetIdObservableImpl.java
index bd8cd3c..6a08d46 100644
--- a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/TargetIdObservableImpl.java
+++ b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/TargetIdObservableImpl.java
@@ -58,7 +58,9 @@ public class TargetIdObservableImpl implements TargetIdObservable {
         return edgesFromSourceObservable.edgesFromSourceDescending( gm, sourceNode ).map( edge -> {
             final Id targetNode = edge.getTargetNode();
 
-            logger.debug( "Emitting targetId of {}", edge );
+            if (logger.isDebugEnabled()) {
+                logger.debug("Emitting targetId of {}", edge);
+            }
 
 
             return targetNode;

http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/migration/EdgeDataMigrationImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/migration/EdgeDataMigrationImpl.java b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/migration/EdgeDataMigrationImpl.java
index 15ff337..8eccdbd 100644
--- a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/migration/EdgeDataMigrationImpl.java
+++ b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/migration/EdgeDataMigrationImpl.java
@@ -94,7 +94,7 @@ public class EdgeDataMigrationImpl implements DataMigration {
                                                     final MutationBatch batch = keyspace.prepareMutationBatch();
 
                                                     for ( Edge edge : edges ) {
-                                                        logger.info( "Migrating meta for edge {}", edge );
+                                                        logger.info("Migrating meta for edge {}", edge);
                                                         final MutationBatch edgeBatch =
                                                             migration.to.writeEdge( graphNode.applicationScope, edge );
                                                         batch.mergeShallow( edgeBatch );

http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/ShardEntryGroup.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/ShardEntryGroup.java b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/ShardEntryGroup.java
index 403ccf8..781e737 100644
--- a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/ShardEntryGroup.java
+++ b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/ShardEntryGroup.java
@@ -41,7 +41,7 @@ import com.google.common.base.Preconditions;
  */
 public class ShardEntryGroup {
 
-    private static final Logger LOG = LoggerFactory.getLogger( ShardEntryGroup.class );
+    private static final Logger logger = LoggerFactory.getLogger( ShardEntryGroup.class );
 
     private List<Shard> shards;
 
@@ -143,12 +143,16 @@ public class ShardEntryGroup {
 
 
         if(compactionTarget != null){
-            LOG.debug( "Returning shards {} and {} as read shards", compactionTarget, staticShard );
+            if (logger.isTraceEnabled()) {
+                logger.trace("Returning shards {} and {} as read shards", compactionTarget, staticShard);
+            }
             return Arrays.asList( compactionTarget, staticShard );
         }
 
 
-        LOG.debug( "Returning shards {} read shard", staticShard );
+        if (logger.isTraceEnabled()) {
+            logger.trace("Returning shards {} read shard", staticShard);
+        }
         return  Collections.singleton( staticShard );
     }
 
@@ -168,7 +172,9 @@ public class ShardEntryGroup {
 
             final Shard compactionTarget = getCompactionTarget();
 
-            LOG.debug( "Returning shard {} as write shard", compactionTarget);
+            if (logger.isTraceEnabled()) {
+                logger.trace("Returning shard {} as write shard", compactionTarget);
+            }
 
             return Collections.singleton( compactionTarget  );
 
@@ -177,7 +183,9 @@ public class ShardEntryGroup {
         final Shard staticShard = getRootShard();
 
 
-        LOG.debug( "Returning shard {} as write shard", staticShard);
+        if (logger.isTraceEnabled()) {
+            logger.trace("Returning shard {} as write shard", staticShard);
+        }
 
         return Collections.singleton( staticShard );
 

http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/NodeShardAllocationImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/NodeShardAllocationImpl.java b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/NodeShardAllocationImpl.java
index 116e526..a79b91a 100644
--- a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/NodeShardAllocationImpl.java
+++ b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/NodeShardAllocationImpl.java
@@ -200,7 +200,7 @@ public class NodeShardAllocationImpl implements NodeShardAllocation {
 
         if ( !edges.hasNext() ) {
             if (logger.isTraceEnabled()) logger.trace(
-                "Tried to allocate a new shard for edge meta data {}, " + "but no max value could be found in that row",
+                "Tried to allocate a new shard for edge meta data {}, but no max value could be found in that row",
                 directedEdgeMeta );
             return false;
         }

http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/NodeShardCacheImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/NodeShardCacheImpl.java b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/NodeShardCacheImpl.java
index c5f0bfb..1a88ebb 100644
--- a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/NodeShardCacheImpl.java
+++ b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/NodeShardCacheImpl.java
@@ -70,7 +70,7 @@ import com.google.inject.Inject;
  */
 public class NodeShardCacheImpl implements NodeShardCache {
 
-    private static final Logger LOG = LoggerFactory.getLogger( NodeShardCacheImpl.class );
+    private static final Logger logger = LoggerFactory.getLogger( NodeShardCacheImpl.class );
 
     /**
      * Only cache shards that have < 10k groups.  This is an arbitrary amount, and may change with profiling and

http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/ShardGroupCompactionImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/ShardGroupCompactionImpl.java b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/ShardGroupCompactionImpl.java
index f398fa2..f0b0ac9 100644
--- a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/ShardGroupCompactionImpl.java
+++ b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/ShardGroupCompactionImpl.java
@@ -147,8 +147,8 @@ public class ShardGroupCompactionImpl implements ShardGroupCompaction {
         Preconditions
             .checkArgument( group.shouldCompact( startTime ), "Compaction cannot be run yet.  Ignoring compaction." );
 
-        if(logger.isDebugEnabled()) {
-            logger.debug("Compacting shard group. Audit count is {} ", countAudits.get());
+        if(logger.isTraceEnabled()) {
+            logger.trace("Compacting shard group. Audit count is {} ", countAudits.get());
         }
         final CompactionResult.CompactionBuilder resultBuilder = CompactionResult.builder();
 
@@ -229,7 +229,9 @@ public class ShardGroupCompactionImpl implements ShardGroupCompaction {
         }
 
 
-        logger.info( "Finished compacting {} shards and moved {} edges", sourceShards, edgeCount );
+        if (logger.isTraceEnabled()) {
+            logger.trace("Finished compacting {} shards and moved {} edges", sourceShards, edgeCount);
+        }
 
         resultBuilder.withCopiedEdges( edgeCount ).withSourceShards( sourceShards ).withTargetShard( targetShard );
 
@@ -304,8 +306,8 @@ public class ShardGroupCompactionImpl implements ShardGroupCompaction {
 
         countAudits.getAndIncrement();
 
-        if(logger.isDebugEnabled()) {
-            logger.debug("Auditing shard group {}. count is {} ", group, countAudits.get());
+        if(logger.isTraceEnabled()) {
+            logger.trace("Auditing shard group {}. count is {} ", group, countAudits.get());
         }
 
         /**
@@ -320,7 +322,7 @@ public class ShardGroupCompactionImpl implements ShardGroupCompaction {
         catch ( RejectedExecutionException ree ) {
 
             //ignore, if this happens we don't care, we're saturated, we can check later
-            logger.error( "Rejected audit for shard of scope {} edge, meta {} and group {}", scope, edgeMeta, group );
+            logger.info( "Rejected audit for shard of scope {} edge, meta {} and group {}", scope, edgeMeta, group );
 
             return Futures.immediateFuture( AuditResult.NOT_CHECKED );
         }
@@ -331,7 +333,9 @@ public class ShardGroupCompactionImpl implements ShardGroupCompaction {
         Futures.addCallback( future, new FutureCallback<AuditResult>() {
             @Override
             public void onSuccess( @Nullable final AuditResult result ) {
-                logger.debug( "Successfully completed audit of task {}", result );
+                if (logger.isTraceEnabled()) {
+                    logger.trace("Successfully completed audit of task {}", result);
+                }
             }
 
 
@@ -412,8 +416,8 @@ public class ShardGroupCompactionImpl implements ShardGroupCompaction {
                  */
                 try {
                     CompactionResult result = compact( scope, edgeMeta, group );
-                    logger.info( "Compaction result for compaction of scope {} with edge meta data of {} and shard group "
-                            + "{} is {}", new Object[] { scope, edgeMeta, group, result } );
+                    logger.info( "Compaction result for compaction of scope {} with edge meta data of {} and shard group {} is {}",
+                            scope, edgeMeta, group, result );
                 }
                 finally {
                     shardCompactionTaskTracker.complete( scope, edgeMeta, group );

http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/ShardGroupDeletionImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/ShardGroupDeletionImpl.java b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/ShardGroupDeletionImpl.java
index 6a86385..2fc0d50 100644
--- a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/ShardGroupDeletionImpl.java
+++ b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/ShardGroupDeletionImpl.java
@@ -91,7 +91,7 @@ public class ShardGroupDeletionImpl implements ShardGroupDeletion {
         catch ( RejectedExecutionException ree ) {
 
             //ignore, if this happens we don't care, we're saturated, we can check later
-            logger.error( "Rejected shard delete check for group {}", edgeIterator );
+            logger.info( "Rejected shard delete check for group {}", edgeIterator );
 
             return Futures.immediateFuture( DeleteResult.NOT_CHECKED );
         }

http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EntityMappingParser.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EntityMappingParser.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EntityMappingParser.java
index 42912e9..e466de0 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EntityMappingParser.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EntityMappingParser.java
@@ -36,7 +36,7 @@ import org.apache.usergrid.persistence.model.entity.EntityMap;
  */
 public class EntityMappingParser implements FieldParser {
 
-    private static final Logger log = LoggerFactory.getLogger( EntityMappingParser.class );
+    private static final Logger logger = LoggerFactory.getLogger( EntityMappingParser.class );
 
 
     /**
@@ -113,8 +113,7 @@ public class EntityMappingParser implements FieldParser {
 
         //we don't support indexing 2 dimensional arrays.  Short circuit with a warning so we can track operationally
         if(!lastCollection.isEmpty() && lastCollection.peek() instanceof Collection){
-            log.warn( "Encountered 2 collections consecutively.  " +
-                "N+1 dimensional arrays are unsupported, only arrays of depth 1 are supported" );
+            logger.warn( "Encountered 2 collections consecutively.  N+1 dimensional arrays are unsupported, only arrays of depth 1 are supported" );
             return;
         }
 


Mime
View raw message