Merge branch 'master' into develop

Author: James Cori

src/app.js

@@ -58,20 +58,21 @@ const dataHandler = async (messageSet, topic, partition) => Promise.each(message
       if (isNil(challengeId)) {
         throw new Error(`Challenge ID ${challengeId} is null, will not queue to retry`)
       } else {
-        const retryCountIdentifier = `${config.KAFKA_GROUP_ID.split(' ').join('_')}_retry_count`
-        let currentRetryCount = parseInt(get(messageJSON.payload, retryCountIdentifier, 1), 10)
-        if (currentRetryCount <= config.MAX_RETRIES) {
-          logger.info(`Challenge does not exist yet. Will post the same message back to the bus API and retry in ${currentRetryCount * (config.RETRY_TIMEOUT / 1000)} seconds`)
-          await new Promise((resolve) => {
-            setTimeout(async () => {
-              currentRetryCount += 1
-              await helper.postBusEvent(topic, { ...messageJSON.payload, [retryCountIdentifier]: currentRetryCount })
-              resolve()
-            }, config.RETRY_TIMEOUT * currentRetryCount)
-          })
-        } else {
-          logger.error(`Failed to process message after ${config.MAX_RETRIES} retries. Aborting...`)
-        }
+        logger.warn(`Creating resource failed, no legacy challenge found for ${challengeId} - Retry disabled`)
+        // const retryCountIdentifier = `${config.KAFKA_GROUP_ID.split(' ').join('_')}_retry_count`
+        // let currentRetryCount = parseInt(get(messageJSON.payload, retryCountIdentifier, 1), 10)
+        // if (currentRetryCount <= config.MAX_RETRIES) {
+        //   logger.info(`Challenge does not exist yet. Will post the same message back to the bus API and retry in ${currentRetryCount * (config.RETRY_TIMEOUT / 1000)} seconds`)
+        //   await new Promise((resolve) => {
+        //     setTimeout(async () => {
+        //       currentRetryCount += 1
+        //       await helper.postBusEvent(topic, { ...messageJSON.payload, [retryCountIdentifier]: currentRetryCount })
+        //       resolve()
+        //     }, config.RETRY_TIMEOUT * currentRetryCount)
+        //   })
+        // } else {
+        //   logger.error(`Failed to process message after ${config.MAX_RETRIES} retries. Aborting...`)
+        // }
       }
     }
     // only commit if no errors

src/services/ProcessorService.js

@@ -123,12 +123,11 @@ async function _updateChallengeResource (message, isDelete) {
 async function createChallengeResource (message) {
   try {
     await _updateChallengeResource(message, false)
+    logger.info(`Successfully processed create challenge resource message : ${JSON.stringify(message)}`)
   } catch (e) {
     logger.error(e.message)
     logger.logFullError(e)
   }
-
-  // logger.debug(`Successfully processed create challenge resource message : ${JSON.stringify(message)}`)
 }
 
 createChallengeResource.schema = {
@@ -153,11 +152,10 @@ createChallengeResource.schema = {
 async function deleteChallengeResource (message) {
   try {
     await _updateChallengeResource(message, true)
+    logger.info(`Successfully processed delete challenge resource message : ${JSON.stringify(message)}`)
   } catch (e) {
     logger.error(`Failed to find and delete the resource: ${JSON.stringify(message)} Error: ${JSON.stringify(e)}`)
   }
-
-  // logger.debug(`Successfully processed delete challenge resource message : ${JSON.stringify(message)}`)
 }
 
 deleteChallengeResource.schema = createChallengeResource.schema