Index: branches/b_3_45_00_00/taap/src/main/java/com/gpc/tams/sync/customer/CustomerDomainFeedRequestWorker.java
===================================================================
diff -u -r252326 -r252332
--- branches/b_3_45_00_00/taap/src/main/java/com/gpc/tams/sync/customer/CustomerDomainFeedRequestWorker.java	(.../CustomerDomainFeedRequestWorker.java)	(revision 252326)
+++ branches/b_3_45_00_00/taap/src/main/java/com/gpc/tams/sync/customer/CustomerDomainFeedRequestWorker.java	(.../CustomerDomainFeedRequestWorker.java)	(revision 252332)
@@ -430,13 +430,23 @@
                             }
                         } else {
                             /* done trying */
-                            if (customerDomainPublishMessage.getRetryRecordAttempts() >= MAX_NUMBER_TO_RETRY_FILE) {
+                            boolean attempts = customerDomainPublishMessage.getTries() >= CUSTOMER_FEED_MAX_TRIES;
+                            boolean recordFileAttempts = customerDomainPublishMessage.getRetryRecordAttempts() >= MAX_NUMBER_TO_RETRY_FILE;
+                            if (attempts || recordFileAttempts) {
                                 listIterator.remove();
                                 removeCustomerDomainPublishMessage(customerDomainPublishMessage);
-                                logger.error("correlationId : " + customerDomainPublishMessage.getCorrelationId() +
-                                        " CustomerDomainFeedRequestWorker::run Failed all retries for sending Request - \r\n" +
-                                        getPrettyJson(customerDomainPublishMessage.getPayload(false)));
-                                if (!customerDomainPublishMessage.isDontRetry()) {
+                                if (recordFileAttempts) {
+                                    logger.error("correlationId : " + customerDomainPublishMessage.getCorrelationId() +
+                                            " CustomerDomainFeedRequestWorker::run Failed all retries for sending Request - \r\n" +
+                                            getPrettyJson(customerDomainPublishMessage.getPayload(false)));
+                                    AzureLogger.write(LogType.Feature.CustomerDomain, storeNumber, LogType.Status.RED, 418,
+                                            "CustomerDomainFeedRequestWorker::processRecordFiles Exceeded retry limit for customer event: " +
+                                                    customerDomainPublishMessage.getLogEventInfo() +
+                                                    " , will not retry again.", null, null, customerDomainPublishMessage.getCorrelationId());
+                                } else if (!customerDomainPublishMessage.isDontRetry()) {
+                                    logger.info("CustomerDomainFeedRequestWorker::run Failed all attempts for for event info : " +
+                                            customerDomainPublishMessage.getLogEventInfo() + ", reschedule for later ...");
+                                    updateChangeQueStatus(customerDomainPublishMessage.getChangeQueueId(), 'F', retryCount, location);
                                     customerDomainPublishMessage.resetTrackingValues();
                                     writeRecord(customerDomainPublishMessage, false);
                                 } else {
@@ -503,7 +513,8 @@
                                         file.getName());
                                 AzureLogger.write(LogType.Feature.CustomerDomain, storeNumber, LogType.Status.RED, 418,
                                         "CustomerDomainFeedRequestWorker::processRecordFiles Exceeded retry limit for customer event: " +
-                                                changeQueueId + " , will not retry again.", null, null, customerDomainPublishMessage.getCorrelationId());
+                                                customerDomainPublishMessage.getLogEventInfo() +
+                                                " , will not retry again.", null, null, customerDomainPublishMessage.getCorrelationId());
                                 updateChangeQueStatus(customerDomainPublishMessage.getChangeQueueId(), 'F', retryCount, location);
                             } else if (customerDomainPublishMessage.isDontRetry() || customerDomainPublishMessage.isCompleted()) {
                                 listIterator.remove();