From 920e962811dc5132b25f0426d880e0bfbb621546 Mon Sep 17 00:00:00 2001
From: Michael Nguyen <michael.nguyen@parivedasolutions.com>
Date: Mon, 2 Dec 2019 16:06:56 -0600
Subject: [PATCH] commented out logging.
---
.../indexerqueue/aws/api/IndexerQueue.java | 34 +++++++++----------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/provider/indexer-aws/indexer-queue-aws/src/main/java/org/opengroup/osdu/indexerqueue/aws/api/IndexerQueue.java b/provider/indexer-aws/indexer-queue-aws/src/main/java/org/opengroup/osdu/indexerqueue/aws/api/IndexerQueue.java
index 1771e2205..85b5540b6 100644
--- a/provider/indexer-aws/indexer-queue-aws/src/main/java/org/opengroup/osdu/indexerqueue/aws/api/IndexerQueue.java
+++ b/provider/indexer-aws/indexer-queue-aws/src/main/java/org/opengroup/osdu/indexerqueue/aws/api/IndexerQueue.java
@@ -40,61 +40,61 @@ public class IndexerQueue {
public static void main(String[] args) {
- Logger log = LogManager.getLogger(IndexerQueue.class);
+// Logger log = LogManager.getLogger(IndexerQueue.class);
try {
- log.debug("Starting Indexer Queue and obtaining Arguments");
+// log.debug("Starting Indexer Queue and obtaining Arguments");
EnvironmentVariables environmentVariables = new EnvironmentVariables();
- log.debug("Retrieving indexer service account JWT");
+// log.debug("Retrieving indexer service account JWT");
AWSCognitoClient cognitoClient = new AWSCognitoClient(environmentVariables.cognitoClientId, environmentVariables.cognitoAuthFlow,
environmentVariables.cognitoUser, environmentVariables.cognitoPassword);
String indexerServiceAccountJWT = cognitoClient.getToken();
if(indexerServiceAccountJWT == null){
- log.error("Indexer service account not set up correctly");
+// log.error("Indexer service account not set up correctly");
}
- log.debug(String.format("Connecting to the SQS Queue: %s", environmentVariables.queueName));
+// log.debug(String.format("Connecting to the SQS Queue: %s", environmentVariables.queueName));
AmazonSQSConfig sqsConfig = new AmazonSQSConfig(environmentVariables.region);
AmazonSQS sqsClient = sqsConfig.AmazonSQS();
- log.debug(String.format("Creating a thread pool with %s threads", environmentVariables.maxIndexThreads));
+// log.debug(String.format("Creating a thread pool with %s threads", environmentVariables.maxIndexThreads));
ThreadPoolExecutor executorPool = (ThreadPoolExecutor) Executors.newFixedThreadPool(environmentVariables.maxIndexThreads);
final String deadLetterQueueUrl = sqsClient.getQueueUrl(environmentVariables.deadLetterQueueName).getQueueUrl();
List<Message> messages = IndexerQueueService.getMessages(sqsClient, environmentVariables.queueName, environmentVariables.maxBatchRequestCount, environmentVariables.maxMessagesAllowed);
- log.debug(String.format("Processing %s messages from storage queue", messages.size()));
+// log.debug(String.format("Processing %s messages from storage queue", messages.size()));
if (!messages.isEmpty()) {
List<IndexProcessor> indexProcessors = IndexerQueueService.processQueue(messages, environmentVariables.targetURL, executorPool, indexerServiceAccountJWT);
- log.debug(String.format("%s Messages Processed", indexProcessors.size()));
+// log.debug(String.format("%s Messages Processed", indexProcessors.size()));
List<IndexProcessor> failedProcessors = indexProcessors.stream().filter(indexProcessor -> indexProcessor.result == CallableResult.Fail || indexProcessor.exception != null).collect(Collectors.toList());
- log.debug(String.format("%s Messages Failed", failedProcessors.size()));
+// log.debug(String.format("%s Messages Failed", failedProcessors.size()));
List<SendMessageResult> deadLetterResults = IndexerQueueService.sendMsgsToDeadLetterQueue(deadLetterQueueUrl, failedProcessors, sqsClient);
- log.debug(String.format("%s Messages Dead Lettered", deadLetterResults.size()));
+// log.debug(String.format("%s Messages Dead Lettered", deadLetterResults.size()));
List<DeleteMessageBatchRequestEntry> deleteEntries = indexProcessors.stream().map(indexProcessor -> new DeleteMessageBatchRequestEntry(indexProcessor.messageId, indexProcessor.receiptHandle)).collect(Collectors.toList());
- log.debug(String.format("%s Messages Deleting", deleteEntries.size()));
+// log.debug(String.format("%s Messages Deleting", deleteEntries.size()));
final String sqsQueueUrl = sqsClient.getQueueUrl(environmentVariables.queueName).getQueueUrl();
List<DeleteMessageBatchRequest> deleteBatchRequests = IndexerQueueService.createMultipleBatchDeleteRequest(sqsQueueUrl, deleteEntries, environmentVariables.maxBatchRequestCount);
- log.debug(String.format("%s Delete Batch Request Created", deleteBatchRequests.size()));
+// log.debug(String.format("%s Delete Batch Request Created", deleteBatchRequests.size()));
List<DeleteMessageBatchResult> deleteMessageBatchResults = IndexerQueueService.deleteMessages(deleteBatchRequests, sqsClient);
- log.debug(String.format("%s Requests Deleted", deleteMessageBatchResults.size()));
+// log.debug(String.format("%s Requests Deleted", deleteMessageBatchResults.size()));
}
} catch (ExecutionException e) {
- log.error(e.getMessage(), e);
+// log.error(e.getMessage(), e);
} catch (InterruptedException e) {
- log.error(e.getMessage(), e);
+// log.error(e.getMessage(), e);
} catch (NullPointerException e) {
- log.error(e.getMessage(), e);
+// log.error(e.getMessage(), e);
}catch (Exception e) {
- log.error(e.getMessage(), e);
+// log.error(e.getMessage(), e);
}
}
--
GitLab