You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by mr...@apache.org on 2016/02/02 17:42:39 UTC
[2/7] usergrid git commit: USERGRID-1243: logging overhaul, pt. 1
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexBatchImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexBatchImpl.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexBatchImpl.java
index a49e217..9427be1 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexBatchImpl.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexBatchImpl.java
@@ -19,7 +19,6 @@
package org.apache.usergrid.persistence.index.impl;
-import java.util.List;
import java.util.UUID;
import org.apache.usergrid.persistence.index.*;
@@ -31,12 +30,11 @@ import org.apache.usergrid.persistence.core.util.ValidationUtils;
import org.apache.usergrid.persistence.index.utils.IndexValidationUtils;
import org.apache.usergrid.persistence.model.entity.Entity;
import org.apache.usergrid.persistence.model.entity.Id;
-import rx.Observable;
public class EsEntityIndexBatchImpl implements EntityIndexBatch {
- private static final Logger log = LoggerFactory.getLogger( EsEntityIndexBatchImpl.class );
+ private static final Logger logger = LoggerFactory.getLogger( EsEntityIndexBatchImpl.class );
private final IndexAlias alias;
@@ -70,9 +68,9 @@ public class EsEntityIndexBatchImpl implements EntityIndexBatch {
final String writeAlias = alias.getWriteAlias();
- if ( log.isDebugEnabled() ) {
- log.debug( "Indexing to alias {} with scope {} on edge {} with entity data {}",
- new Object[] { writeAlias, applicationScope, indexEdge, entity } );
+ if ( logger.isDebugEnabled() ) {
+ logger.debug( "Indexing to alias {} with scope {} on edge {} with entity data {}",
+ writeAlias, applicationScope, indexEdge, entity );
}
//add app id for indexing
@@ -94,9 +92,9 @@ public class EsEntityIndexBatchImpl implements EntityIndexBatch {
throw new IllegalStateException("No indexes exist for " + indexLocationStrategy.getAlias().getWriteAlias());
}
- if ( log.isDebugEnabled() ) {
- log.debug( "Deindexing to indexes {} with scope {} on edge {} with id {} and version {} ",
- new Object[] { indexes, applicationScope, searchEdge, id, version } );
+ if ( logger.isDebugEnabled() ) {
+ logger.debug( "Deindexing to indexes {} with scope {} on edge {} with id {} and version {} ",
+ indexes, applicationScope, searchEdge, id, version );
}
@@ -113,9 +111,9 @@ public class EsEntityIndexBatchImpl implements EntityIndexBatch {
throw new IllegalStateException("No indexes exist for " + indexLocationStrategy.getAlias().getWriteAlias());
}
- if ( log.isDebugEnabled() ) {
- log.debug( "Deindexing to indexes {} with with documentId {} ",
- new Object[] { indexes, docId } );
+ if ( logger.isDebugEnabled() ) {
+ logger.debug( "Deindexing to indexes {} with with documentId {} ",
+ indexes, docId );
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
index 0cfa18b..ba3af95 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
@@ -293,7 +293,9 @@ public class EsEntityIndexImpl implements EntityIndex,VersionedData {
// to receive documents. Occasionally we see errors.
// See this post: http://s.apache.org/index-missing-exception
- logger.debug("Testing new index name: read {} write {}", alias.getReadAlias(), alias.getWriteAlias());
+ if (logger.isTraceEnabled()) {
+ logger.trace("Testing new index name: read {} write {}", alias.getReadAlias(), alias.getWriteAlias());
+ }
final RetryOperation retryOperation = () -> {
final String tempId = UUIDGenerator.newTimeUUID().toString();
@@ -301,15 +303,18 @@ public class EsEntityIndexImpl implements EntityIndex,VersionedData {
esProvider.getClient().prepareIndex( alias.getWriteAlias(), VERIFY_TYPE, tempId )
.setSource(DEFAULT_PAYLOAD).get();
- logger.info( "Successfully created new document with docId {} "
- + "in index read {} write {} and type {}",
- tempId, alias.getReadAlias(), alias.getWriteAlias(), VERIFY_TYPE );
+ if (logger.isTraceEnabled()) {
+ logger.trace("Successfully created new document with docId {} in index read {} write {} and type {}",
+ tempId, alias.getReadAlias(), alias.getWriteAlias(), VERIFY_TYPE);
+ }
// delete all types, this way if we miss one it will get cleaned up
esProvider.getClient().prepareDelete( alias.getWriteAlias(), VERIFY_TYPE, tempId).get();
- logger.info( "Successfully deleted documents in read {} write {} and type {} with id {}",
- alias.getReadAlias(), alias.getWriteAlias(), VERIFY_TYPE, tempId );
+ if (logger.isTraceEnabled()) {
+ logger.trace("Successfully deleted documents in read {} write {} and type {} with id {}",
+ alias.getReadAlias(), alias.getWriteAlias(), VERIFY_TYPE, tempId);
+ }
return true;
};
@@ -359,7 +364,9 @@ public class EsEntityIndexImpl implements EntityIndex,VersionedData {
String[] indexes = getIndexes();
if (indexes.length == 0) {
- logger.debug("Not refreshing indexes. none found");
+ if (logger.isTraceEnabled()) {
+ logger.trace("Not refreshing indexes. none found");
+ }
}
//Added For Graphite Metrics
RefreshResponse response =
@@ -372,8 +379,10 @@ public class EsEntityIndexImpl implements EntityIndex,VersionedData {
logger.error("Failed to refresh index:{} reason:{}", sfe.index(), sfe.reason());
}
}
- logger.debug("Refreshed indexes: {},success:{} failed:{} ", StringUtils.join(indexes, ", "),
- successfulShards, failedShards);
+ if (logger.isTraceEnabled()) {
+ logger.trace("Refreshed indexes: {},success:{} failed:{} ", StringUtils.join(indexes, ", "),
+ successfulShards, failedShards);
+ }
IndexRefreshCommandInfo refreshResults = new IndexRefreshCommandInfo(failedShards == 0,
System.currentTimeMillis() - start);
@@ -647,10 +656,10 @@ public class EsEntityIndexImpl implements EntityIndex,VersionedData {
final ShardOperationFailedException[] failures = indexDeleteByQueryResponse.getFailures();
for ( ShardOperationFailedException failedException : failures ) {
- logger.error( String.format( "Unable to delete by query %s. "
- + "Failed with code %d and reason %s on shard %s in index %s", query.toString(),
+ logger.error("Unable to delete by query {}. Failed with code {} and reason {} on shard {} in index {}",
+ query.toString(),
failedException.status().getStatus(), failedException.reason(),
- failedException.shardId(), failedException.index() ) );
+ failedException.shardId(), failedException.index() );
}
}
}
@@ -665,7 +674,9 @@ public class EsEntityIndexImpl implements EntityIndex,VersionedData {
final SearchHits searchHits = searchResponse.getHits();
final SearchHit[] hits = searchHits.getHits();
- logger.debug( " Hit count: {} Total hits: {}", hits.length, searchHits.getTotalHits() );
+ if (logger.isTraceEnabled()) {
+ logger.trace(" Hit count: {} Total hits: {}", hits.length, searchHits.getTotalHits());
+ }
List<CandidateResult> candidates = new ArrayList<>( hits.length );
@@ -706,8 +717,8 @@ public class EsEntityIndexImpl implements EntityIndex,VersionedData {
if(candidateResult.getVersion().timestamp() <= markedVersion.timestamp()){
- if(logger.isDebugEnabled()){
- logger.debug("Candidate version {} is <= provided entity version {} for entityId {}",
+ if(logger.isTraceEnabled()){
+ logger.trace("Candidate version {} is <= provided entity version {} for entityId {}",
candidateResult.getVersion(),
markedVersion,
candidateResult.getId()
@@ -717,8 +728,8 @@ public class EsEntityIndexImpl implements EntityIndex,VersionedData {
candidates.add(candidateResult);
}else{
- if(logger.isDebugEnabled()){
- logger.debug("Candidate version {} is > provided entity version {} for entityId {}. Not" +
+ if(logger.isTraceEnabled()){
+ logger.trace("Candidate version {} is > provided entity version {} for entityId {}. Not" +
"adding to candidate results",
candidateResult.getVersion(),
markedVersion,
@@ -732,7 +743,9 @@ public class EsEntityIndexImpl implements EntityIndex,VersionedData {
}
}
- logger.debug( "Aggregated {} out of {} hits ",candidates.size(),searchHits.getTotalHits() );
+ if (logger.isTraceEnabled()) {
+ logger.trace("Aggregated {} out of {} hits ", candidates.size(), searchHits.getTotalHits());
+ }
return candidates;
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsIndexProducerImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsIndexProducerImpl.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsIndexProducerImpl.java
index f9dd114..4782bea 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsIndexProducerImpl.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsIndexProducerImpl.java
@@ -51,7 +51,7 @@ import rx.Observable;
*/
@Singleton
public class EsIndexProducerImpl implements IndexProducer {
- private static final Logger log = LoggerFactory.getLogger( EsIndexProducerImpl.class );
+ private static final Logger logger = LoggerFactory.getLogger( EsIndexProducerImpl.class );
private final IndexFig config;
private final FailureMonitorImpl failureMonitor;
@@ -116,7 +116,9 @@ public class EsIndexProducerImpl implements IndexProducer {
final int indexOperationSetSize = indexOperationSet.size();
final int deIndexOperationSetSize = deIndexOperationSet.size();
- log.debug("Emitting {} add and {} remove operations", indexOperationSetSize, deIndexOperationSetSize);
+ if (logger.isTraceEnabled()) {
+ logger.trace("Emitting {} add and {} remove operations", indexOperationSetSize, deIndexOperationSetSize);
+ }
indexSizeCounter.dec(indexOperationSetSize);
indexSizeCounter.dec(deIndexOperationSetSize);
@@ -133,7 +135,9 @@ public class EsIndexProducerImpl implements IndexProducer {
.flatMap(individualOps -> Observable.from(individualOps)
//collect them
.collect(() -> initRequest(), (bulkRequestBuilder, batchOperation) -> {
- log.debug("adding operation {} to bulkRequestBuilder {}", batchOperation, bulkRequestBuilder);
+ if (logger.isTraceEnabled()) {
+ logger.trace("adding operation {} to bulkRequestBuilder {}", batchOperation, bulkRequestBuilder);
+ }
batchOperation.doOperation(client, bulkRequestBuilder);
}))
//write them
@@ -188,7 +192,7 @@ public class EsIndexProducerImpl implements IndexProducer {
try {
responses = bulkRequest.execute().actionGet( );
} catch ( Throwable t ) {
- log.error( "Unable to communicate with elasticsearch", t );
+ logger.error( "Unable to communicate with elasticsearch", t );
failureMonitor.fail( "Unable to execute batch", t );
throw t;
}finally{
@@ -206,7 +210,7 @@ public class EsIndexProducerImpl implements IndexProducer {
if ( response.isFailed() ) {
// log error and continue processing
- log.error( "Unable to index id={}, type={}, index={}, failureMessage={} ", response.getId(),
+ logger.error( "Unable to index id={}, type={}, index={}, failureMessage={} ", response.getId(),
response.getType(), response.getIndex(), response.getFailureMessage() );
//if index is overloaded on the queue fail.
if(response.getFailure()!=null && response.getFailure().getStatus() == RestStatus.TOO_MANY_REQUESTS){
@@ -221,8 +225,8 @@ public class EsIndexProducerImpl implements IndexProducer {
if ( error ) {
if(hasTooManyRequests){
try{
- log.warn("Encountered Queue Capacity Exception from ElasticSearch slowing by "
- + indexFig.getSleepTimeForQueueError() );
+ logger.warn("Encountered Queue Capacity Exception from ElasticSearch slowing by {}",
+ indexFig.getSleepTimeForQueueError() );
Thread.sleep(indexFig.getSleepTimeForQueueError());
}catch (Exception e){
//move on
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsProvider.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsProvider.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsProvider.java
index 096bd17..60c41f6 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsProvider.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsProvider.java
@@ -46,7 +46,7 @@ import com.google.inject.Singleton;
@Singleton
public class EsProvider {
- private static final Logger log = LoggerFactory.getLogger( EsProvider.class );
+ private static final Logger logger = LoggerFactory.getLogger( EsProvider.class );
private final IndexFig indexFig;
private static Client client;
@@ -135,7 +135,7 @@ public class EsProvider {
}
catch ( UnknownHostException ex ) {
nodeName = "client-" + RandomStringUtils.randomAlphabetic( 8 );
- log.warn( "Couldn't get hostname to use as ES node name, using " + nodeName );
+ logger.warn( "Couldn't get hostname to use as ES node name, using {}", nodeName );
}
}
@@ -196,7 +196,9 @@ public class EsProvider {
.build();
- log.debug( "Creating ElasticSearch client with settings: {}", settings.getAsMap() );
+ if (logger.isTraceEnabled()) {
+ logger.trace("Creating ElasticSearch client with settings: {}", settings.getAsMap());
+ }
Node node = NodeBuilder.nodeBuilder().settings( settings ).client( true ).data( false ).node();
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/FailureMonitorImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/FailureMonitorImpl.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/FailureMonitorImpl.java
index 7de3a7c..943eabb 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/FailureMonitorImpl.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/FailureMonitorImpl.java
@@ -37,7 +37,7 @@ import org.apache.usergrid.persistence.index.IndexFig;
*/
public class FailureMonitorImpl implements FailureMonitor {
- private static final Logger LOG = LoggerFactory.getLogger( FailureMonitorImpl.class );
+ private static final Logger logger = LoggerFactory.getLogger( FailureMonitorImpl.class );
/**
* Exceptions that will cause us to increment our count and restart
@@ -74,9 +74,8 @@ public class FailureMonitorImpl implements FailureMonitor {
final int maxCount = indexFig.getFailRefreshCount();
if ( fails > maxCount ) {
- LOG.error( "Unable to connect to elasticsearch. Reason is {}", message, throwable );
- LOG.warn( "We have failed to connect to Elastic Search {} times. "
- + "Max allowed is {}. Resetting connection", fails, maxCount );
+ logger.error( "Unable to connect to elasticsearch. Reason is {}", message, throwable );
+ logger.warn( "We have failed to connect to Elastic Search {} times. Max allowed is {}. Resetting connection", fails, maxCount );
esProvider.releaseClient();
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/migration/EsIndexMappingMigrationPlugin.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/migration/EsIndexMappingMigrationPlugin.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/migration/EsIndexMappingMigrationPlugin.java
index e29ed81..246c448 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/migration/EsIndexMappingMigrationPlugin.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/migration/EsIndexMappingMigrationPlugin.java
@@ -70,7 +70,7 @@ public class EsIndexMappingMigrationPlugin implements MigrationPlugin {
final int version = migrationInfoSerialization.getVersion(getName());
if (version == getMaxVersion()) {
- logger.debug("Skipping Migration Plugin: " + getName());
+ logger.debug("Skipping Migration Plugin: {}", getName());
return;
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/query/ParsedQueryBuilder.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/query/ParsedQueryBuilder.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/query/ParsedQueryBuilder.java
index bb79e37..4b15332 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/query/ParsedQueryBuilder.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/query/ParsedQueryBuilder.java
@@ -53,7 +53,9 @@ public class ParsedQueryBuilder {
if ( StringUtils.isEmpty( ql ) ) {
return null;
}
- logger.debug( "Processing raw query: " + ql );
+ if (logger.isTraceEnabled()) {
+ logger.trace("Processing raw query: {}", ql);
+ }
final String trimmedLowercaseQuery = ql.trim().toLowerCase();
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/utils/ConversionUtils.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/utils/ConversionUtils.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/utils/ConversionUtils.java
index 503d597..1aaf380 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/utils/ConversionUtils.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/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/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/utils/ListUtils.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/utils/ListUtils.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/utils/ListUtils.java
index 26395b4..c93428e 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/utils/ListUtils.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/utils/ListUtils.java
@@ -30,7 +30,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 ) {
@@ -69,7 +69,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;
}
@@ -89,7 +89,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;
}
@@ -109,7 +109,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;
}
@@ -129,7 +129,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/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/GeoPagingTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/GeoPagingTest.java b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/GeoPagingTest.java
index d71c47e..eb6651f 100644
--- a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/GeoPagingTest.java
+++ b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/GeoPagingTest.java
@@ -58,7 +58,6 @@ import static org.junit.Assert.fail;
/**
* // TODO: Document this
*
- * @author ApigeeCorporation
* @since 4.0
*/
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/QueueScopeImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/QueueScopeImpl.java b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/QueueScopeImpl.java
index 09a0bcd..fa50b49 100644
--- a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/QueueScopeImpl.java
+++ b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/QueueScopeImpl.java
@@ -20,9 +20,6 @@ package org.apache.usergrid.persistence.queue.impl;
import org.apache.usergrid.persistence.model.entity.Id;
import org.apache.usergrid.persistence.queue.QueueScope;
-/**
- * Created by ApigeeCorporation on 10/3/14.
- */
public class QueueScopeImpl implements QueueScope {
private final String name;
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/SNSQueueManagerImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/SNSQueueManagerImpl.java b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/SNSQueueManagerImpl.java
index 31b478d..3a1f045 100644
--- a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/SNSQueueManagerImpl.java
+++ b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/SNSQueueManagerImpl.java
@@ -183,27 +183,27 @@ public class SNSQueueManagerImpl implements QueueManager {
String primaryTopicArn = AmazonNotificationUtils.getTopicArn( sns, queueName, true );
- if ( logger.isDebugEnabled() ) {
- logger.debug( "SNS/SQS Setup: primaryTopicArn=" + primaryTopicArn );
+ if ( logger.isTraceEnabled() ) {
+ logger.trace( "SNS/SQS Setup: primaryTopicArn={}", primaryTopicArn );
}
String queueUrl = AmazonNotificationUtils.getQueueUrlByName( sqs, queueName );
String primaryQueueArn = AmazonNotificationUtils.getQueueArnByName( sqs, queueName );
- if ( logger.isDebugEnabled() ) {
- logger.debug( "SNS/SQS Setup: primaryQueueArn=" + primaryQueueArn );
+ if ( logger.isTraceEnabled() ) {
+ logger.trace( "SNS/SQS Setup: primaryQueueArn={}", primaryQueueArn );
}
if ( primaryQueueArn == null ) {
- if ( logger.isDebugEnabled() ) {
- logger.debug( "SNS/SQS Setup: primaryQueueArn is null, creating queue..." );
+ if ( logger.isTraceEnabled() ) {
+ logger.trace( "SNS/SQS Setup: primaryQueueArn is null, creating queue..." );
}
queueUrl = AmazonNotificationUtils.createQueue( sqs, queueName, fig );
primaryQueueArn = AmazonNotificationUtils.getQueueArnByUrl( sqs, queueUrl );
- if ( logger.isDebugEnabled() ) {
- logger.debug( "SNS/SQS Setup: New Queue URL=[{}] ARN=[{}]", queueUrl, primaryQueueArn );
+ if ( logger.isTraceEnabled() ) {
+ logger.trace( "SNS/SQS Setup: New Queue URL=[{}] ARN=[{}]", queueUrl, primaryQueueArn );
}
}
@@ -219,15 +219,15 @@ public class SNSQueueManagerImpl implements QueueManager {
}
catch ( AmazonServiceException e ) {
logger.error(
- String.format( "Unable to subscribe PRIMARY queue=[%s] to topic=[%s]", queueUrl, primaryTopicArn ), e );
+ "Unable to subscribe PRIMARY queue=[{}] to topic=[{}]", queueUrl, primaryTopicArn, e );
}
if ( fig.isMultiRegion() && scope.getRegionImplementation() == QueueScope.RegionImplementation.ALL ) {
String multiRegion = fig.getRegionList();
- if ( logger.isDebugEnabled() ) {
- logger.debug( "MultiRegion Setup specified, regions: [{}]", multiRegion );
+ if ( logger.isTraceEnabled() ) {
+ logger.trace( "MultiRegion Setup specified, regions: [{}]", multiRegion );
}
String[] regionNames = multiRegion.split( "," );
@@ -261,7 +261,9 @@ public class SNSQueueManagerImpl implements QueueManager {
arrQueueArns.put( queueArn, regionName );
}
- logger.debug( "Creating Subscriptions..." );
+ if (logger.isTraceEnabled()) {
+ logger.trace("Creating Subscriptions...");
+ }
for ( Map.Entry<String, String> queueArnEntry : arrQueueArns.entrySet() ) {
String queueARN = queueArnEntry.getKey();
@@ -297,20 +299,21 @@ public class SNSQueueManagerImpl implements QueueManager {
SubscribeResult subscribeResult = subscribeSnsClient.subscribe( subscribeRequest );
String subscriptionARN = subscribeResult.getSubscriptionArn();
- if ( logger.isDebugEnabled() ) {
- logger.debug(
+ if ( logger.isTraceEnabled() ) {
+ logger.trace(
"Successfully subscribed Queue ARN=[{}] to Topic ARN=[{}], subscription ARN=[{}]",
queueARN, topicARN, subscriptionARN );
}
}
catch ( Exception e ) {
- logger.error( String
- .format( "ERROR Subscribing Queue ARN/Region=[%s / %s] and Topic ARN/Region=[%s / %s]",
- queueARN, strSqsRegion, topicARN, strSnsRegion ), e );
+ logger.error( "ERROR Subscribing Queue ARN/Region=[{} / {}] and Topic ARN/Region=[{} / {}]",
+ queueARN, strSqsRegion, topicARN, strSnsRegion , e );
}
}
- logger.info( "Adding permission to receive messages..." );
+ if (logger.isTraceEnabled()) {
+ logger.trace("Adding permission to receive messages...");
+ }
// add permission to each queue, providing a list of topics that it's subscribed to
AmazonNotificationUtils
.setQueuePermissionsToReceive( subscribeSqsClient, subscribeQueueUrl, topicArnList );
@@ -409,8 +412,8 @@ public class SNSQueueManagerImpl implements QueueManager {
String url = getReadQueue().getUrl();
- if ( logger.isDebugEnabled() ) {
- logger.debug( "Getting up to {} messages from {}", limit, url );
+ if ( logger.isTraceEnabled() ) {
+ logger.trace( "Getting up to {} messages from {}", limit, url );
}
ReceiveMessageRequest receiveMessageRequest = new ReceiveMessageRequest( url );
@@ -422,8 +425,8 @@ public class SNSQueueManagerImpl implements QueueManager {
ReceiveMessageResult result = sqs.receiveMessage( receiveMessageRequest );
List<Message> messages = result.getMessages();
- if ( logger.isDebugEnabled() ) {
- logger.debug( "Received {} messages from {}", messages.size(), url );
+ if ( logger.isTraceEnabled() ) {
+ logger.trace( "Received {} messages from {}", messages.size(), url );
}
List<QueueMessage> queueMessages = new ArrayList<>( messages.size() );
@@ -452,7 +455,7 @@ public class SNSQueueManagerImpl implements QueueManager {
}
}
catch ( Exception e ) {
- logger.error( String.format( "failed to deserialize message: %s", message.getBody() ), e );
+ logger.error( "failed to deserialize message: {}", message.getBody(), e );
throw new RuntimeException( e );
}
@@ -465,10 +468,10 @@ public class SNSQueueManagerImpl implements QueueManager {
return queueMessages ;
}
catch ( com.amazonaws.services.sqs.model.QueueDoesNotExistException dne ) {
- logger.error( String.format( "Queue does not exist! [%s]", url ), dne );
+ logger.error( "Queue does not exist! [{}]", url , dne );
}
catch ( Exception e ) {
- logger.error( String.format( "Programming error getting messages from queue=[%s] exist!", url ), e );
+ logger.error( "Programming error getting messages from queue=[{}] exist!", url, e );
}
return new ArrayList<>( 0 ) ;
@@ -516,8 +519,8 @@ public class SNSQueueManagerImpl implements QueueManager {
String topicArn = getWriteTopicArn();
- if ( logger.isDebugEnabled() ) {
- logger.debug( "Publishing Message...{} to arn: {}", stringBody, topicArn );
+ if ( logger.isTraceEnabled() ) {
+ logger.trace( "Publishing Message...{} to arn: {}", stringBody, topicArn );
}
PublishRequest publishRequest = new PublishRequest( topicArn, stringBody );
@@ -531,8 +534,8 @@ public class SNSQueueManagerImpl implements QueueManager {
@Override
public void onSuccess( PublishRequest request, PublishResult result ) {
- if ( logger.isDebugEnabled() ) {
- logger.debug( "Successfully published... messageID=[{}], arn=[{}]", result.getMessageId(),
+ if ( logger.isTraceEnabled() ) {
+ logger.trace( "Successfully published... messageID=[{}], arn=[{}]", result.getMessageId(),
request.getTopicArn() );
}
}
@@ -566,8 +569,8 @@ public class SNSQueueManagerImpl implements QueueManager {
String url = getReadQueue().getUrl();
- if ( logger.isDebugEnabled() ) {
- logger.debug( "Publishing Message...{} to url: {}", stringBody, url );
+ if ( logger.isTraceEnabled() ) {
+ logger.trace( "Publishing Message...{} to url: {}", stringBody, url );
}
SendMessageRequest request = new SendMessageRequest( url, stringBody );
@@ -583,8 +586,8 @@ public class SNSQueueManagerImpl implements QueueManager {
@Override
public void onSuccess( final SendMessageRequest request, final SendMessageResult sendMessageResult ) {
- if ( logger.isDebugEnabled() ) {
- logger.debug( "Successfully send... messageBody=[{}], url=[{}]", request.getMessageBody(),
+ if ( logger.isTraceEnabled() ) {
+ logger.trace( "Successfully send... messageBody=[{}], url=[{}]", request.getMessageBody(),
request.getQueueUrl() );
}
}
@@ -604,8 +607,8 @@ public class SNSQueueManagerImpl implements QueueManager {
@Override
public void commitMessage( final QueueMessage queueMessage ) {
String url = getReadQueue().getUrl();
- if ( logger.isDebugEnabled() ) {
- logger.debug( "Commit message {} to queue {}", queueMessage.getMessageId(), url );
+ if ( logger.isTraceEnabled() ) {
+ logger.trace( "Commit message {} to queue {}", queueMessage.getMessageId(), url );
}
sqs.deleteMessage(
@@ -617,8 +620,8 @@ public class SNSQueueManagerImpl implements QueueManager {
public void commitMessages( final List<QueueMessage> queueMessages ) {
String url = getReadQueue().getUrl();
- if ( logger.isDebugEnabled() ) {
- logger.debug( "Commit messages {} to queue {}", queueMessages.size(), url );
+ if ( logger.isTraceEnabled() ) {
+ logger.trace( "Commit messages {} to queue {}", queueMessages.size(), url );
}
List<DeleteMessageBatchRequestEntry> entries = new ArrayList<>();
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/util/AmazonNotificationUtils.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/util/AmazonNotificationUtils.java b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/util/AmazonNotificationUtils.java
index d57870d..b6b1aaa 100644
--- a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/util/AmazonNotificationUtils.java
+++ b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/util/AmazonNotificationUtils.java
@@ -131,7 +131,7 @@ public class AmazonNotificationUtils {
return null;
}
catch ( Exception e ) {
- logger.error( String.format( "Failed to get URL for Queue [%s] from SQS", queueName ), e );
+ logger.error( "Failed to get URL for Queue [{}] from SQS", queueName, e );
throw e;
}
@@ -177,8 +177,8 @@ public class AmazonNotificationUtils {
public static String getTopicArn( final AmazonSNSClient sns, final String queueName, final boolean createOnMissing )
throws Exception {
- if ( logger.isDebugEnabled() ) {
- logger.debug( "Looking up Topic ARN: {}", queueName );
+ if ( logger.isTraceEnabled() ) {
+ logger.trace( "Looking up Topic ARN: {}", queueName );
}
ListTopicsResult listTopicsResult = sns.listTopics();
@@ -190,25 +190,31 @@ public class AmazonNotificationUtils {
if ( queueName.equals( arn.substring( arn.lastIndexOf( ':' ) ) ) ) {
topicArn = arn;
- logger.info( "Found existing topic arn=[{}] for queue=[{}]", topicArn, queueName );
+ if (logger.isTraceEnabled()) {
+ logger.trace( "Found existing topic arn=[{}] for queue=[{}]", topicArn, queueName );
+ }
}
}
if ( topicArn == null && createOnMissing ) {
- logger.info( "Creating topic for queue=[{}]...", queueName );
+ if (logger.isTraceEnabled()) {
+ logger.trace("Creating topic for queue=[{}]...", queueName);
+ }
CreateTopicResult createTopicResult = sns.createTopic( queueName );
topicArn = createTopicResult.getTopicArn();
- logger.info( "Successfully created topic with name {} and arn {}", queueName, topicArn );
+ if (logger.isTraceEnabled()) {
+ logger.trace("Successfully created topic with name {} and arn {}", queueName, topicArn);
+ }
}
else {
logger.error( "Error looking up topic ARN for queue=[{}] and createOnMissing=[{}]", queueName,
createOnMissing );
}
- if ( logger.isDebugEnabled() ) {
- logger.debug( "Returning Topic ARN=[{}] for Queue=[{}]", topicArn, queueName );
+ if ( logger.isTraceEnabled() ) {
+ logger.trace( "Returning Topic ARN=[{}] for Queue=[{}]", topicArn, queueName );
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/pom.xml
----------------------------------------------------------------------
diff --git a/stack/pom.xml b/stack/pom.xml
index e97e16e..a72e6f3 100644
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@ -115,7 +115,7 @@
<log4j-version>1.2.16</log4j-version>
<org.springframework.version>3.2.13.RELEASE</org.springframework.version>
<shiro-version>1.2.4</shiro-version>
- <slf4j-version>1.6.1</slf4j-version>
+ <slf4j-version>1.7.2</slf4j-version>
<snakeyaml-version>1.9</snakeyaml-version>
<tomcat-version>7.0.64</tomcat-version>
<antlr.version>3.4</antlr.version>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/rest/src/main/java/org/apache/usergrid/rest/AbstractContextResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/AbstractContextResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/AbstractContextResource.java
index 68c894b..da41b59 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/AbstractContextResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/AbstractContextResource.java
@@ -116,8 +116,8 @@ public abstract class AbstractContextResource {
public <T extends AbstractContextResource> T getSubResource(Class<T> t) {
- if (logger.isDebugEnabled()) {
- logger.debug("getSubResource: " + t.getCanonicalName());
+ if (logger.isTraceEnabled()) {
+ logger.trace("getSubResource: {}", t.getCanonicalName());
}
T subResource = resourceContext.getResource(t);
subResource.setParent(this);
@@ -175,13 +175,13 @@ public abstract class AbstractContextResource {
if (StringUtils.isNotBlank(redirect_url)) {
if (logger.isDebugEnabled()) {
- logger.debug("Redirecting to URL: ", redirect_url);
+ logger.debug("Redirecting to URL: {}", redirect_url);
}
sendRedirect(redirect_url);
}
- if (logger.isDebugEnabled()) {
- logger.debug("Dispatching to viewable with template: {}", template, template_property);
+ if (logger.isTraceEnabled()) {
+ logger.trace("Dispatching to viewable with template: {} property: {}", template, template_property);
}
Viewable viewable = new Viewable(template, model);
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/rest/src/main/java/org/apache/usergrid/rest/RootResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/RootResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/RootResource.java
index 4b30010..b7118a3 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/RootResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/RootResource.java
@@ -102,7 +102,9 @@ public class RootResource extends AbstractContextResource implements MetricProce
@QueryParam("deleted") @DefaultValue("false") Boolean deleted,
@QueryParam("callback") @DefaultValue("callback") String callback ) throws URISyntaxException {
- logger.info( "RootResource.getData" );
+ if (logger.isTraceEnabled()) {
+ logger.trace("RootResource.getData");
+ }
ApiResponse response = createApiResponse();
response.setAction( "get applications" );
@@ -340,8 +342,8 @@ public class RootResource extends AbstractContextResource implements MetricProce
@Path("orgs/{organizationName}")
public OrganizationResource getOrganizationByName3( @PathParam("organizationName") String organizationName )
throws Exception {
- if (logger.isDebugEnabled()) {
- logger.debug("getOrganizationByName3");
+ if (logger.isTraceEnabled()) {
+ logger.trace("getOrganizationByName3");
}
return getOrganizationByName( organizationName );
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/rest/src/main/java/org/apache/usergrid/rest/SwaggerServlet.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/SwaggerServlet.java b/stack/rest/src/main/java/org/apache/usergrid/rest/SwaggerServlet.java
index e7fad4d..f272c6b 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/SwaggerServlet.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/SwaggerServlet.java
@@ -62,7 +62,9 @@ public class SwaggerServlet extends HttpServlet implements Filter {
@Override
public void init( ServletConfig config ) throws ServletException {
super.init( config );
- logger.info( "init(ServletConfig config)" );
+ if (logger.isTraceEnabled()) {
+ logger.trace("init(ServletConfig config)");
+ }
if ( sc == null ) {
sc = config.getServletContext();
}
@@ -73,7 +75,9 @@ public class SwaggerServlet extends HttpServlet implements Filter {
@Override
public void init( FilterConfig config ) throws ServletException {
- logger.info( "init(FilterConfig paramFilterConfig)" );
+ if (logger.isTraceEnabled()) {
+ logger.trace("init(FilterConfig paramFilterConfig)");
+ }
if ( sc == null ) {
sc = config.getServletContext();
}
@@ -107,7 +111,9 @@ public class SwaggerServlet extends HttpServlet implements Filter {
public void loadSwagger() {
- logger.info( "loadSwagger()" );
+ if (logger.isTraceEnabled()) {
+ logger.trace( "loadSwagger()" );
+ }
pathToJson.put( "/resources.json", loadTempate( "/swagger/resources.json" ) );
pathToJson.put( "/applications.json", loadTempate( "/swagger/applications.json" ) );
pathToJson.put( "/management.json", loadTempate( "/swagger/management.json" ) );
@@ -120,7 +126,9 @@ public class SwaggerServlet extends HttpServlet implements Filter {
String path = request.getServletPath();
- logger.info( "Swagger request: " + path );
+ if (logger.isTraceEnabled()) {
+ logger.trace("Swagger request: {}" + path);
+ }
handleJsonOutput( request, response );
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ApplicationResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ApplicationResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ApplicationResource.java
index 5d76b3b..d384cb6 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ApplicationResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ApplicationResource.java
@@ -153,8 +153,8 @@ public class ApplicationResource extends ServiceResource {
@RequireApplicationAccess
@Path("assets")
public AssetsResource getAssetsResource( @Context UriInfo ui ) throws Exception {
- if (logger.isDebugEnabled()) {
- logger.debug("in assets n applicationResource");
+ if (logger.isTraceEnabled()) {
+ logger.trace("in assets n applicationResource");
}
addParameter( getServiceParameters(), "assets" );
@@ -171,8 +171,8 @@ public class ApplicationResource extends ServiceResource {
@Path("asset")
public AssetsResource getAssetResource( @Context UriInfo ui ) throws Exception {
// TODO change to singular
- if (logger.isDebugEnabled()) {
- logger.debug("in asset in applicationResource");
+ if (logger.isTraceEnabled()) {
+ logger.trace("in asset in applicationResource");
}
return getAssetsResource( ui );
}
@@ -180,8 +180,8 @@ public class ApplicationResource extends ServiceResource {
@Path("users")
public UsersResource getUsers( @Context UriInfo ui ) throws Exception {
- if (logger.isDebugEnabled()) {
- logger.debug("ApplicationResource.getUsers");
+ if (logger.isTraceEnabled()) {
+ logger.trace("ApplicationResource.getUsers");
}
addParameter( getServiceParameters(), "users" );
@@ -210,8 +210,8 @@ public class ApplicationResource extends ServiceResource {
@QueryParam("ttl") long ttl, @QueryParam("redirect_uri") String redirect_uri,
@QueryParam("callback") @DefaultValue("") String callback ) throws Exception {
- if (logger.isDebugEnabled()) {
- logger.debug("ApplicationResource.getAccessToken");
+ if (logger.isTraceEnabled()) {
+ logger.trace("ApplicationResource.getAccessToken");
}
User user = null;
@@ -273,7 +273,7 @@ public class ApplicationResource extends ServiceResource {
if ( user == null ) {
if (logger.isDebugEnabled()) {
- logger.debug("Returning 400 bad request due to: " + errorDescription);
+ logger.debug("Returning 400 bad request due to: {}", errorDescription);
}
OAuthResponse response =
@@ -313,8 +313,8 @@ public class ApplicationResource extends ServiceResource {
@FormParam("redirect_uri") String redirect_uri,
@QueryParam("callback") @DefaultValue("") String callback ) throws Exception {
- if (logger.isDebugEnabled()) {
- logger.debug("ApplicationResource.getAccessTokenPost");
+ if (logger.isTraceEnabled()) {
+ logger.trace("ApplicationResource.getAccessTokenPost");
}
return getAccessToken( ui, authorization, grant_type, username, password, pin, client_id, client_secret, code,
@@ -363,8 +363,8 @@ public class ApplicationResource extends ServiceResource {
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
- if (logger.isDebugEnabled()) {
- logger.debug("AuthResource.keys");
+ if (logger.isTraceEnabled()) {
+ logger.trace("AuthResource.keys");
}
if ( !isApplicationAdmin( Identifier.fromUUID( applicationId ) ) ) {
@@ -387,8 +387,8 @@ public class ApplicationResource extends ServiceResource {
public ApiResponse generateKeys( @Context UriInfo ui,
@QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception {
- if (logger.isDebugEnabled()) {
- logger.debug("AuthResource.keys");
+ if (logger.isTraceEnabled()) {
+ logger.trace("AuthResource.keys");
}
if ( !isApplicationAdmin( Identifier.fromUUID( applicationId ) ) ) {
@@ -451,8 +451,8 @@ public class ApplicationResource extends ServiceResource {
@FormParam("username") String username,
@FormParam("password") String password ) {
- if (logger.isDebugEnabled()) {
- logger.debug("ApplicationResource /authorize: {}/{}", username, password);
+ if (logger.isTraceEnabled()) {
+ logger.trace("ApplicationResource /authorize: {}/{}", username, password);
}
try {
@@ -564,8 +564,8 @@ public class ApplicationResource extends ServiceResource {
Class cls = Class.forName( "org.apache.usergrid.rest.applications.notifiers.NotifiersResource" );
- if (logger.isDebugEnabled()) {
- logger.debug("NotifiersResource.getNotifiersResource");
+ if (logger.isTraceEnabled()) {
+ logger.trace("NotifiersResource.getNotifiersResource");
}
addParameter( getServiceParameters(), "notifiers" );
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/rest/src/main/java/org/apache/usergrid/rest/applications/AuthResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/AuthResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/AuthResource.java
index d90a44c..e5464de 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/AuthResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/AuthResource.java
@@ -94,7 +94,9 @@ public class AuthResource extends AbstractContextResource {
@QueryParam("ttl") long ttl, @QueryParam("callback") @DefaultValue("") String callback )
throws Exception {
- logger.info( "AuthResource.authFBPost" );
+ if (logger.isTraceEnabled()) {
+ logger.trace("AuthResource.authFBPost");
+ }
return authFB( ui, fb_access_token, ttl, callback );
}
@@ -105,7 +107,9 @@ public class AuthResource extends AbstractContextResource {
@Path("pingident")
public Response authPingIdent( @Context UriInfo ui, @QueryParam("ping_access_token") String pingToken,
@QueryParam("callback") @DefaultValue("") String callback ) throws Exception {
- logger.info( "AuthResource.pingIdent" );
+ if (logger.isTraceEnabled()) {
+ logger.trace("AuthResource.pingIdent");
+ }
try {
if ( StringUtils.isEmpty( pingToken ) ) {
missingTokenFail( callback );
@@ -178,7 +182,9 @@ public class AuthResource extends AbstractContextResource {
@QueryParam("ttl") long ttl, @QueryParam("callback") @DefaultValue("") String callback )
throws Exception {
- logger.info( "AuthResource.authFB" );
+ if (logger.isTraceEnabled()) {
+ logger.trace("AuthResource.authFB");
+ }
try {
if ( StringUtils.isEmpty( fb_access_token ) ) {
@@ -214,7 +220,9 @@ public class AuthResource extends AbstractContextResource {
@QueryParam("ttl") long ttl, @QueryParam("callback") @DefaultValue("") String callback )
throws Exception {
- logger.info( "AuthResource.authFQPost" );
+ if (logger.isTraceEnabled()) {
+ logger.trace("AuthResource.authFQPost");
+ }
return authFQ( ui, fq_access_token, ttl, callback );
}
@@ -227,7 +235,9 @@ public class AuthResource extends AbstractContextResource {
@QueryParam("ttl") long ttl, @QueryParam("callback") @DefaultValue("") String callback )
throws Exception {
- logger.info( "AuthResource.authFQ" );
+ if (logger.isTraceEnabled()) {
+ logger.trace("AuthResource.authFQ");
+ }
try {
if ( StringUtils.isEmpty( fq_access_token ) ) {
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ServiceResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ServiceResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ServiceResource.java
index 70adf35..78d0e2a 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ServiceResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ServiceResource.java
@@ -183,8 +183,8 @@ public class ServiceResource extends AbstractContextResource {
@Path("file")
public AbstractContextResource getFileResource( @Context UriInfo ui ) throws Exception {
- if(logger.isDebugEnabled()){
- logger.debug( "ServiceResource.getFileResource" );
+ if(logger.isTraceEnabled()){
+ logger.trace( "ServiceResource.getFileResource" );
}
ServiceParameter.addParameter( getServiceParameters(), "assets" );
@@ -202,8 +202,8 @@ public class ServiceResource extends AbstractContextResource {
public AbstractContextResource addIdParameter( @Context UriInfo ui, @PathParam("entityId") PathSegment entityId )
throws Exception {
- if(logger.isDebugEnabled()){
- logger.debug( "ServiceResource.addIdParameter" );
+ if(logger.isTraceEnabled()){
+ logger.trace( "ServiceResource.addIdParameter" );
}
UUID itemId = UUID.fromString( entityId.getPath() );
@@ -219,9 +219,9 @@ public class ServiceResource extends AbstractContextResource {
@Path("{itemName}")
public AbstractContextResource addNameParameter( @Context UriInfo ui, @PathParam("itemName") PathSegment itemName )
throws Exception {
- if(logger.isDebugEnabled()){
- logger.debug( "ServiceResource.addNameParameter" );
- logger.debug( "Current segment is {}", itemName.getPath() );
+ if(logger.isTraceEnabled()){
+ logger.trace( "ServiceResource.addNameParameter" );
+ logger.trace( "Current segment is {}", itemName.getPath() );
}
@@ -243,8 +243,8 @@ public class ServiceResource extends AbstractContextResource {
public ServiceResults executeServiceRequest( UriInfo ui, ApiResponse response, ServiceAction action,
ServicePayload payload ) throws Exception {
- if(logger.isDebugEnabled()){
- logger.debug( "ServiceResource.executeServiceRequest" );
+ if(logger.isTraceEnabled()){
+ logger.trace( "ServiceResource.executeServiceRequest" );
}
@@ -334,8 +334,8 @@ public class ServiceResource extends AbstractContextResource {
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
- if(logger.isDebugEnabled()){
- logger.debug( "ServiceResource.executeGet" );
+ if(logger.isTraceEnabled()){
+ logger.trace( "ServiceResource.executeGet" );
}
ApiResponse response = createApiResponse();
@@ -385,8 +385,8 @@ public class ServiceResource extends AbstractContextResource {
public ApiResponse executePostWithObject( @Context UriInfo ui, Object json,
@QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception {
- if(logger.isDebugEnabled()){
- logger.debug( "ServiceResource.executePostWithMap" );
+ if(logger.isTraceEnabled()){
+ logger.trace( "ServiceResource.executePostWithMap" );
}
ApiResponse response = createApiResponse();
@@ -434,8 +434,8 @@ public class ServiceResource extends AbstractContextResource {
public ApiResponse executePost( @Context UriInfo ui, String body,
@QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception {
- if(logger.isDebugEnabled()){
- logger.debug( "ServiceResource.executePost: body = " + body );
+ if(logger.isTraceEnabled()){
+ logger.trace( "ServiceResource.executePost: body = {}", body );
}
Object json;
@@ -470,8 +470,8 @@ public class ServiceResource extends AbstractContextResource {
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
- if(logger.isDebugEnabled()){
- logger.debug( "ServiceResource.executePut" );
+ if(logger.isTraceEnabled()){
+ logger.trace( "ServiceResource.executePut" );
}
ObjectMapper mapper = new ObjectMapper();
@@ -491,8 +491,8 @@ public class ServiceResource extends AbstractContextResource {
@QueryParam("app_delete_confirm") String confirmAppDelete )
throws Exception {
- if(logger.isDebugEnabled()){
- logger.debug( "ServiceResource.executeDelete" );
+ if(logger.isTraceEnabled()){
+ logger.trace( "ServiceResource.executeDelete" );
}
ApiResponse response = createApiResponse();
@@ -610,8 +610,8 @@ public class ServiceResource extends AbstractContextResource {
@QueryParam("callback") @DefaultValue("callback") String callback,
FormDataMultiPart multiPart ) throws Exception {
- if(logger.isDebugEnabled()){
- logger.debug( "ServiceResource.executeMultiPartPost" );
+ if(logger.isTraceEnabled()){
+ logger.trace( "ServiceResource.executeMultiPartPost" );
}
return executeMultiPart( ui, callback, multiPart, ServiceAction.POST );
}
@@ -626,8 +626,8 @@ public class ServiceResource extends AbstractContextResource {
@QueryParam("callback") @DefaultValue("callback") String callback,
FormDataMultiPart multiPart ) throws Exception {
- if(logger.isDebugEnabled()){
- logger.debug( "ServiceResource.executeMultiPartPut" );
+ if(logger.isTraceEnabled()){
+ logger.trace( "ServiceResource.executeMultiPartPut" );
}
return executeMultiPart( ui, callback, multiPart, ServiceAction.PUT );
}
@@ -655,7 +655,9 @@ public class ServiceResource extends AbstractContextResource {
data.put( bodyPart.getName(), bodyPart.getValue() );
}
else {
- logger.info( "skipping bodyPart {} of media type {}", bodyPart.getName(), bodyPart.getMediaType() );
+ if (logger.isTraceEnabled()) {
+ logger.trace("skipping bodyPart {} of media type {}", bodyPart.getName(), bodyPart.getMediaType());
+ }
}
}
@@ -754,8 +756,8 @@ public class ServiceResource extends AbstractContextResource {
@HeaderParam("range") String rangeHeader,
@HeaderParam("if-modified-since") String modifiedSince ) throws Exception {
- if(logger.isDebugEnabled()){
- logger.debug( "ServiceResource.executeStreamGet" );
+ if(logger.isTraceEnabled()){
+ logger.trace( "ServiceResource.executeStreamGet" );
}
//Needed for testing
@@ -773,9 +775,9 @@ public class ServiceResource extends AbstractContextResource {
ServiceResults serviceResults = executeServiceRequest( ui, response, ServiceAction.GET, null );
Entity entity = serviceResults.getEntity();
- if(logger.isDebugEnabled()){
- logger.debug( "In ServiceResource.executeStreamGet with id: {}, range: {}, modifiedSince: {}",
- new Object[] { entityId, rangeHeader, modifiedSince } );
+ if(logger.isTraceEnabled()){
+ logger.trace( "In ServiceResource.executeStreamGet with id: {}, range: {}, modifiedSince: {}",
+ entityId, rangeHeader, modifiedSince );
}
Map<String, Object> fileMetadata = AssetUtils.getFileMetadata( entity );
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/rest/src/main/java/org/apache/usergrid/rest/applications/assets/AssetsResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/assets/AssetsResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/assets/AssetsResource.java
index 6eb6307..b894205 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/assets/AssetsResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/assets/AssetsResource.java
@@ -71,9 +71,13 @@ public class AssetsResource extends ServiceResource {
@Path("{itemName}")
public AbstractContextResource addNameParameter( @Context UriInfo ui, @PathParam("itemName") PathSegment itemName )
throws Exception {
- logger.info( "in AssetsResource.addNameParameter" );
+ if (logger.isTraceEnabled()) {
+ logger.trace("in AssetsResource.addNameParameter");
+ }
super.addNameParameter( ui, itemName );
- logger.info( "serviceParamters now has: {}", getServiceParameters() );
+ if (logger.isTraceEnabled()) {
+ logger.trace("serviceParamters now has: {}", getServiceParameters());
+ }
// HTF to work w/ the ../data endpoint when we are looking up by path?
return getSubResource( AssetsResource.class );
}
@@ -87,7 +91,9 @@ public class AssetsResource extends ServiceResource {
public ApiResponse executeGet( @Context UriInfo ui,
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
- logger.info( "In AssetsResource.executeGet with ui: {} and callback: {}", ui, callback );
+ if (logger.isTraceEnabled()) {
+ logger.trace("In AssetsResource.executeGet with ui: {} and callback: {}", ui, callback);
+ }
return super.executeGet( ui, callback );
}
@@ -164,12 +170,16 @@ public class AssetsResource extends ServiceResource {
}
UUID assetId = UUID.fromString( entityId.getPath() );
- logger.info( "In AssetsResource.uploadDataStream with id: {}", assetId );
+ if (logger.isTraceEnabled()) {
+ logger.trace("In AssetsResource.uploadDataStream with id: {}", assetId);
+ }
EntityManager em = emf.getEntityManager( getApplicationId() );
Asset asset = em.get( assetId, Asset.class );
binaryStore.write( getApplicationId(), asset, uploadedInputStream );
- logger.info( "uploadDataStream written, returning response" );
+ if (logger.isTraceEnabled()) {
+ logger.trace("uploadDataStream written, returning response");
+ }
em.update( asset );
return Response.status( 200 ).build();
}
@@ -189,8 +199,10 @@ public class AssetsResource extends ServiceResource {
}
UUID assetId = UUID.fromString( entityId.getPath() );
- logger.info( "In AssetsResource.findAsset with id: {}, range: {}, modifiedSince: {}",
- new Object[] { assetId, range, modifiedSince } );
+ if (logger.isTraceEnabled()) {
+ logger.trace("In AssetsResource.findAsset with id: {}, range: {}, modifiedSince: {}",
+ assetId, range, modifiedSince);
+ }
EntityManager em = emf.getEntityManager( getApplicationId() );
Asset asset = em.get( assetId, Asset.class );
@@ -217,7 +229,9 @@ public class AssetsResource extends ServiceResource {
return Response.status( Response.Status.NOT_FOUND ).build();
}
- logger.info( "AssetResource.findAsset read inputStream, composing response" );
+ if (logger.isTraceEnabled()) {
+ logger.trace("AssetResource.findAsset read inputStream, composing response");
+ }
Response.ResponseBuilder responseBuilder =
Response.ok( is ).type( fileMetadata.get( "content-type" ).toString() )
.lastModified( new Date( asset.getModified() ) );
@@ -225,7 +239,9 @@ public class AssetsResource extends ServiceResource {
responseBuilder.tag( ( String ) fileMetadata.get( AssetUtils.E_TAG ) );
}
if ( StringUtils.isNotBlank( range ) ) {
- logger.info( "Range header was not blank, sending back Content-Range" );
+ if (logger.isTraceEnabled()) {
+ logger.trace("Range header was not blank, sending back Content-Range");
+ }
// TODO build content range header if needed
//responseBuilder.header("Content-Range", );
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/rest/src/main/java/org/apache/usergrid/rest/applications/notifiers/NotifierResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/notifiers/NotifierResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/notifiers/NotifierResource.java
index 4e4a3b1..2049983 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/notifiers/NotifierResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/notifiers/NotifierResource.java
@@ -65,8 +65,8 @@ public class NotifierResource extends ServiceResource {
@QueryParam("callback") @DefaultValue("callback") String callback,
FormDataMultiPart multiPart) throws Exception {
- if (logger.isDebugEnabled()) {
- logger.debug("NotifierResource.executeMultiPartPut");
+ if (logger.isTraceEnabled()) {
+ logger.trace("NotifierResource.executeMultiPartPut");
}
String certInfoParam = getValueOrNull(multiPart, "certInfo");
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/rest/src/main/java/org/apache/usergrid/rest/applications/notifiers/NotifiersResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/notifiers/NotifiersResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/notifiers/NotifiersResource.java
index 53b29b4..b92e775 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/notifiers/NotifiersResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/notifiers/NotifiersResource.java
@@ -56,8 +56,8 @@ public class NotifiersResource extends ServiceResource {
public AbstractContextResource addIdParameter(@Context UriInfo ui,
@PathParam("entityId") PathSegment entityId) throws Exception {
- if (logger.isDebugEnabled()) {
- logger.debug("NotifiersResource.addIdParameter");
+ if (logger.isTraceEnabled()) {
+ logger.trace("NotifiersResource.addIdParameter");
}
UUID itemId = UUID.fromString(entityId.getPath());
@@ -74,9 +74,9 @@ public class NotifiersResource extends ServiceResource {
public AbstractContextResource addNameParameter(@Context UriInfo ui,
@PathParam("itemName") PathSegment itemName) throws Exception {
- if (logger.isDebugEnabled()) {
- logger.debug("NotifiersResource.addNameParameter");
- logger.debug("Current segment is " + itemName.getPath());
+ if (logger.isTraceEnabled()) {
+ logger.trace("NotifiersResource.addNameParameter");
+ logger.trace("Current segment is {}", itemName.getPath());
}
if (itemName.getPath().startsWith("{")) {
@@ -113,8 +113,8 @@ public class NotifiersResource extends ServiceResource {
FormDataMultiPart multiPart)
throws Exception {
- if (logger.isDebugEnabled()) {
- logger.debug("Notifiers.executeMultiPartPost");
+ if (logger.isTraceEnabled()) {
+ logger.trace("Notifiers.executeMultiPartPost");
}
String certInfoParam = getValueOrNull(multiPart, "certInfo");
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/rest/src/main/java/org/apache/usergrid/rest/applications/queues/QueueResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/queues/QueueResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/queues/QueueResource.java
index 609b860..ac177aa 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/queues/QueueResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/queues/QueueResource.java
@@ -65,7 +65,9 @@ public class QueueResource extends AbstractContextResource {
@Path("{subPath}")
public QueueResource getSubPath( @Context UriInfo ui, @PathParam("subPath") String subPath ) throws Exception {
- logger.info( "QueueResource.getSubPath" );
+ if (logger.isTraceEnabled()) {
+ logger.trace("QueueResource.getSubPath");
+ }
return getSubResource( QueueResource.class ).init( mq, queuePath + "/" + subPath );
}
@@ -75,7 +77,9 @@ public class QueueResource extends AbstractContextResource {
@Path("subscribers")
public QueueSubscriberResource getSubscribers( @Context UriInfo ui ) throws Exception {
- logger.info( "QueueResource.getSubscribers" );
+ if (logger.isTraceEnabled()) {
+ logger.trace("QueueResource.getSubscribers");
+ }
return getSubResource( QueueSubscriberResource.class ).init( mq, queuePath );
}
@@ -85,7 +89,9 @@ public class QueueResource extends AbstractContextResource {
@Path("subscriptions")
public QueueSubscriptionResource getSubscriptions( @Context UriInfo ui ) throws Exception {
- logger.info( "QueueResource.getSubscriptions" );
+ if (logger.isTraceEnabled()) {
+ logger.trace("QueueResource.getSubscriptions");
+ }
return getSubResource( QueueSubscriptionResource.class ).init( mq, queuePath );
}
@@ -100,7 +106,9 @@ public class QueueResource extends AbstractContextResource {
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
- logger.info( "QueueResource.getProperties" );
+ if (logger.isTraceEnabled()) {
+ logger.trace("QueueResource.getProperties");
+ }
return mq.getQueue( queuePath );
}
@@ -116,7 +124,9 @@ public class QueueResource extends AbstractContextResource {
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
- logger.info( "QueueResource.putProperties" );
+ if (logger.isTraceEnabled()) {
+ logger.trace("QueueResource.putProperties");
+ }
return mq.updateQueue( queuePath, json );
}
@@ -132,14 +142,18 @@ public class QueueResource extends AbstractContextResource {
throws Exception {
if ( StringUtils.isNotBlank( queuePath ) ) {
- logger.info( "QueueResource.executeGet: " + queuePath );
+ if (logger.isTraceEnabled()) {
+ logger.trace("QueueResource.executeGet: {}", queuePath);
+ }
QueueQuery query = QueueQuery.fromQueryParams( ui.getQueryParameters() );
QueueResults results = mq.getFromQueue( queuePath, query );
return results;
}
- logger.info( "QueueResource.executeGet" );
+ if (logger.isTraceEnabled()) {
+ logger.trace( "QueueResource.executeGet" );
+ }
return mq.getQueues( firstQueuePath, limit );
}
@@ -155,7 +169,9 @@ public class QueueResource extends AbstractContextResource {
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
- logger.info( "QueueResource.executePost: " + queuePath );
+ if (logger.isTraceEnabled()) {
+ logger.trace("QueueResource.executePost: {}", queuePath);
+ }
Object json = body;
if ( json instanceof Map ) {
@@ -178,7 +194,9 @@ public class QueueResource extends AbstractContextResource {
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
- logger.info( "QueueResource.executePut: " + queuePath );
+ if (logger.isTraceEnabled()) {
+ logger.trace("QueueResource.executePut: {}", queuePath);
+ }
Map<String, Object> results = new HashMap<String, Object>();
@@ -200,7 +218,9 @@ public class QueueResource extends AbstractContextResource {
@Path("transactions")
public QueueTransactionsResource getTransactions( @Context UriInfo ui ) throws Exception {
- logger.info( "QueueResource.getSubscriptions" );
+ if (logger.isTraceEnabled()) {
+ logger.trace("QueueResource.getSubscriptions");
+ }
return getSubResource( QueueTransactionsResource.class ).init( mq, queuePath );
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/rest/src/main/java/org/apache/usergrid/rest/applications/queues/QueueSubscriberResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/queues/QueueSubscriberResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/queues/QueueSubscriberResource.java
index b264e8f..54cc8ab 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/queues/QueueSubscriberResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/queues/QueueSubscriberResource.java
@@ -74,7 +74,9 @@ public class QueueSubscriberResource extends AbstractContextResource {
public QueueSubscriberResource getSubPath( @Context UriInfo ui, @PathParam("subPath") String subPath )
throws Exception {
- logger.info( "QueueSubscriberResource.getSubPath" );
+ if (logger.isTraceEnabled()) {
+ logger.trace("QueueSubscriberResource.getSubPath");
+ }
return getSubResource( QueueSubscriberResource.class ).init( mq, queuePath, subscriberPath + "/" + subPath );
}
@@ -89,7 +91,9 @@ public class QueueSubscriberResource extends AbstractContextResource {
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
- logger.info( "QueueSubscriberResource.executeGet: " + queuePath );
+ if (logger.isTraceEnabled()) {
+ logger.trace("QueueSubscriberResource.executeGet: {}", queuePath);
+ }
QueueSet results = mq.getSubscribers( queuePath, firstSubscriberQueuePath, limit );
@@ -106,7 +110,9 @@ public class QueueSubscriberResource extends AbstractContextResource {
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
- logger.info( "QueueSubscriberResource.executePost: " + queuePath );
+ if (logger.isTraceEnabled()) {
+ logger.trace("QueueSubscriberResource.executePost: {}", queuePath);
+ }
return executePut( ui, body, callback );
}
@@ -121,7 +127,9 @@ public class QueueSubscriberResource extends AbstractContextResource {
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
- logger.info( "QueueSubscriberResource.executePut: " + queuePath );
+ if (logger.isTraceEnabled()) {
+ logger.trace("QueueSubscriberResource.executePut: {}", queuePath);
+ }
Map<String, Object> json = body;
if ( StringUtils.isNotBlank( subscriberPath ) ) {
@@ -148,7 +156,9 @@ public class QueueSubscriberResource extends AbstractContextResource {
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
- logger.info( "QueueSubscriberResource.executeDelete: " + queuePath );
+ if (logger.isTraceEnabled()) {
+ logger.trace("QueueSubscriberResource.executeDelete: {}", queuePath);
+ }
if ( StringUtils.isNotBlank( subscriberPath ) ) {
return mq.unsubscribeFromQueue( queuePath, subscriberPath );
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/rest/src/main/java/org/apache/usergrid/rest/applications/queues/QueueSubscriptionResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/queues/QueueSubscriptionResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/queues/QueueSubscriptionResource.java
index 778b57d..acc13a3 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/queues/QueueSubscriptionResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/queues/QueueSubscriptionResource.java
@@ -75,7 +75,9 @@ public class QueueSubscriptionResource extends AbstractContextResource {
public QueueSubscriptionResource getSubPath( @Context UriInfo ui, @PathParam("subPath") String subPath )
throws Exception {
- logger.info( "QueueSubscriptionResource.getSubPath" );
+ if (logger.isTraceEnabled()) {
+ logger.info("QueueSubscriptionResource.getSubPath");
+ }
return getSubResource( QueueSubscriptionResource.class )
.init( mq, queuePath, subscriptionPath + "/" + subPath );
@@ -91,7 +93,9 @@ public class QueueSubscriptionResource extends AbstractContextResource {
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
- logger.info( "QueueSubscriptionResource.executeGet: " + queuePath );
+ if (logger.isTraceEnabled()) {
+ logger.trace("QueueSubscriptionResource.executeGet: {}", queuePath);
+ }
QueueSet results = mq.getSubscriptions( queuePath, firstSubscriptionQueuePath, limit );
@@ -108,7 +112,9 @@ public class QueueSubscriptionResource extends AbstractContextResource {
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
- logger.info( "QueueSubscriptionResource.executePost: " + queuePath );
+ if (logger.isTraceEnabled()) {
+ logger.trace("QueueSubscriptionResource.executePost: {}", queuePath);
+ }
return executePut( ui, body, callback );
}
@@ -123,7 +129,9 @@ public class QueueSubscriptionResource extends AbstractContextResource {
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
- logger.info( "QueueSubscriptionResource.executePut: " + queuePath );
+ if (logger.isTraceEnabled()) {
+ logger.trace("QueueSubscriptionResource.executePut: {}", queuePath);
+ }
Map<String, Object> json = body;
if ( StringUtils.isNotBlank( subscriptionPath ) ) {
@@ -150,7 +158,9 @@ public class QueueSubscriptionResource extends AbstractContextResource {
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
- logger.info( "QueueSubscriptionResource.executeDelete: " + queuePath );
+ if (logger.isTraceEnabled()) {
+ logger.trace("QueueSubscriptionResource.executeDelete: {}", queuePath);
+ }
if ( StringUtils.isNotBlank( subscriptionPath ) ) {
return mq.unsubscribeFromQueue( subscriptionPath, queuePath );